diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig
index 52a291ff2c..8730a20d07 100644
--- a/configs/samd21-xplained/nsh/defconfig
+++ b/configs/samd21-xplained/nsh/defconfig
@@ -128,21 +128,21 @@ CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYW=y
 #
 # Atmel SAMD/L Configuration Options
 #
-# CONFIG_ARCH_CHIP_SAMD21E14 is not set
-# CONFIG_ARCH_CHIP_SAMD21E15 is not set
-# CONFIG_ARCH_CHIP_SAMD21E16 is not set
-# CONFIG_ARCH_CHIP_SAMD21E17 is not set
-# CONFIG_ARCH_CHIP_SAMD21E18 is not set
-# CONFIG_ARCH_CHIP_SAMD21G14 is not set
-# CONFIG_ARCH_CHIP_SAMD21G15 is not set
-# CONFIG_ARCH_CHIP_SAMD21G16 is not set
-# CONFIG_ARCH_CHIP_SAMD21G17 is not set
-# CONFIG_ARCH_CHIP_SAMD21G18 is not set
-# CONFIG_ARCH_CHIP_SAMD21J14 is not set
-# CONFIG_ARCH_CHIP_SAMD21J15 is not set
-# CONFIG_ARCH_CHIP_SAMD21J16 is not set
-# CONFIG_ARCH_CHIP_SAMD21J17 is not set
-CONFIG_ARCH_CHIP_SAMD21J18=y
+# CONFIG_ARCH_CHIP_SAMD20E14 is not set
+# CONFIG_ARCH_CHIP_SAMD20E15 is not set
+# CONFIG_ARCH_CHIP_SAMD20E16 is not set
+# CONFIG_ARCH_CHIP_SAMD20E17 is not set
+# CONFIG_ARCH_CHIP_SAMD20E18 is not set
+# CONFIG_ARCH_CHIP_SAMD20G14 is not set
+# CONFIG_ARCH_CHIP_SAMD20G15 is not set
+# CONFIG_ARCH_CHIP_SAMD20G16 is not set
+# CONFIG_ARCH_CHIP_SAMD20G17 is not set
+# CONFIG_ARCH_CHIP_SAMD20G18 is not set
+# CONFIG_ARCH_CHIP_SAMD20J14 is not set
+# CONFIG_ARCH_CHIP_SAMD20J15 is not set
+# CONFIG_ARCH_CHIP_SAMD20J16 is not set
+# CONFIG_ARCH_CHIP_SAMD20J17 is not set
+# CONFIG_ARCH_CHIP_SAMD20J18 is not set
 # CONFIG_ARCH_CHIP_SAMD21E15A is not set
 # CONFIG_ARCH_CHIP_SAMD21E15B is not set
 # CONFIG_ARCH_CHIP_SAMD21E16A is not set
@@ -160,15 +160,15 @@ CONFIG_ARCH_CHIP_SAMD21J18=y
 # CONFIG_ARCH_CHIP_SAMD21J16A is not set
 # CONFIG_ARCH_CHIP_SAMD21J16B is not set
 # CONFIG_ARCH_CHIP_SAMD21J17A is not set
-# CONFIG_ARCH_CHIP_SAMD21J18A is not set
+CONFIG_ARCH_CHIP_SAMD21J18A=y
+# CONFIG_ARCH_FAMILY_SAMD20 is not set
+# 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=y
 # CONFIG_ARCH_FAMILY_SAMD21E is not set
 # CONFIG_ARCH_FAMILY_SAMD21G is not set
 CONFIG_ARCH_FAMILY_SAMD21J=y
-# 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 is not set
 # CONFIG_ARCH_FAMILY_SAML21E is not set
 # CONFIG_ARCH_FAMILY_SAML21G is not set
@@ -177,14 +177,14 @@ CONFIG_ARCH_FAMILY_SAMD21J=y
 #
 # SAMD/L Peripheral Support
 #
-# CONFIG_SAMDL_HAVE_DMAC is not set
+CONFIG_SAMDL_HAVE_DMAC=y
 CONFIG_SAMDL_HAVE_SERCOM4=y
 CONFIG_SAMDL_HAVE_SERCOM5=y
 CONFIG_SAMDL_HAVE_TC5=y
 CONFIG_SAMDL_HAVE_TC2=y
 CONFIG_SAMDL_HAVE_TC3=y
-CONFIG_SAMDL_HAVE_TC6=y
-CONFIG_SAMDL_HAVE_TC7=y
+# CONFIG_SAMDL_HAVE_TC6 is not set
+# CONFIG_SAMDL_HAVE_TC7 is not set
 # CONFIG_SAMDL_AC is not set
 # CONFIG_SAMDL_ADC is not set
 # CONFIG_SAMDL_DAC is not set
@@ -204,8 +204,6 @@ CONFIG_SAMDL_SERCOM4=y
 # CONFIG_SAMDL_TC3 is not set
 # CONFIG_SAMDL_TC4 is not set
 # CONFIG_SAMDL_TC5 is not set
-# CONFIG_SAMDL_TC6 is not set
-# CONFIG_SAMDL_TC7 is not set
 # CONFIG_SAMDL_WDT is not set
 # CONFIG_SAMDL_SERCOM3_ISI2C is not set
 # CONFIG_SAMDL_SERCOM3_ISSPI is not set