diff --git a/configs/saml21-xplained/Kconfig b/configs/saml21-xplained/Kconfig
index 5572d5b6ae..a5b97499f2 100644
--- a/configs/saml21-xplained/Kconfig
+++ b/configs/saml21-xplained/Kconfig
@@ -25,7 +25,7 @@ config SAML21_XPLAINED_OSC16M_16MHZ
 
 endchoice # OSC16M Frequency
 
-config SAMD21_XPLAINED_XOSC32K
+config SAML21_XPLAINED_XOSC32K
 	bool "Enable XOSC32K"
 	default n
 
@@ -43,7 +43,7 @@ config SAML21_XPLAINED_DFLL_OSC16MSRC
 
 config SAML21_XPLAINED_DFLL_XOSC32KSRC
 	bool "XOSCK32K"
-	select SAMD21_XPLAINED_XOSC32K
+	select SAML21_XPLAINED_XOSC32K
 
 endchoice # DFLL Clock Source
 
diff --git a/configs/saml21-xplained/include/board.h b/configs/saml21-xplained/include/board.h
index 727e83d83c..5dfc932aab 100644
--- a/configs/saml21-xplained/include/board.h
+++ b/configs/saml21-xplained/include/board.h
@@ -114,7 +114,7 @@
  */
 
 #undef BOARD_XOSC32K_ENABLE
-#ifdef CONFIG_SAMD21_XPLAINED_XOSC32K
+#ifdef CONFIG_SAML21_XPLAINED_XOSC32K
 #  define BOARD_XOSC32K_ENABLE       1
 #  define BOARD_XOSC32K_FREQUENCY    32768    /* 32.768KHz XTAL */
 #  define BOARD_XOSC32K_STARTUPTIME  OSC32KCTRL_XOSC32K_STARTUP_100MS
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index d0ea6e37cd..881dd1f8a3 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -142,10 +142,19 @@ CONFIG_ARCH_CHIP_SAML21J18=y
 # CONFIG_ARCH_FAMILY_SAMD20E is not set
 # CONFIG_ARCH_FAMILY_SAMD20G is not set
 # CONFIG_ARCH_FAMILY_SAMD20J is not set
+# CONFIG_ARCH_FAMILY_SAMD21 is not set
+# CONFIG_ARCH_FAMILY_SAMD21E is not set
+# CONFIG_ARCH_FAMILY_SAMD21G is not set
+# CONFIG_ARCH_FAMILY_SAMD21J is not set
 CONFIG_ARCH_FAMILY_SAML21=y
 # CONFIG_ARCH_FAMILY_SAML21E is not set
 # CONFIG_ARCH_FAMILY_SAML21G is not set
 CONFIG_ARCH_FAMILY_SAML21J=y
+
+#
+# SAMD/L Peripheral Support
+#
+CONFIG_SAMDL_HAVE_DMAC=y
 CONFIG_SAMDL_HAVE_SERCOM4=y
 CONFIG_SAMDL_HAVE_SERCOM5=y
 CONFIG_SAMDL_HAVE_TC5=y
@@ -153,10 +162,6 @@ CONFIG_SAMDL_HAVE_TC2=y
 CONFIG_SAMDL_HAVE_TC3=y
 # CONFIG_SAMDL_HAVE_TC6 is not set
 # CONFIG_SAMDL_HAVE_TC7 is not set
-
-#
-# SAMD/L Peripheral Support
-#
 # CONFIG_SAMDL_AC is not set
 # CONFIG_SAMDL_ADC is not set
 # CONFIG_SAMDL_DAC is not set
@@ -265,7 +270,7 @@ CONFIG_SAML21_XPLAINED_OSC16M_4MHZ=y
 # CONFIG_SAML21_XPLAINED_OSC16M_8MHZ is not set
 # CONFIG_SAML21_XPLAINED_OSC16M_12MHZ is not set
 # CONFIG_SAML21_XPLAINED_OSC16M_16MHZ is not set
-CONFIG_SAMD21_XPLAINED_XOSC32K=y
+CONFIG_SAML21_XPLAINED_XOSC32K=y
 CONFIG_SAML21_XPLAINED_DFLL=y
 # CONFIG_SAML21_XPLAINED_DFLL_OSC16MSRC is not set
 CONFIG_SAML21_XPLAINED_DFLL_XOSC32KSRC=y