diff --git a/configs/samd20-xplained/README.txt b/configs/samd20-xplained/README.txt
index 866472a9d9..7fe16bcfbb 100644
--- a/configs/samd20-xplained/README.txt
+++ b/configs/samd20-xplained/README.txt
@@ -497,7 +497,7 @@ SAMD20 Xplained Pro-specific Configuration Options
     CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
        chip:
 
-       CONFIG_ARCH_CHIP_SAMD
+       CONFIG_ARCH_CHIP_SAMD2X
        CONFIG_ARCH_CHIP_SAMD20
        CONFIG_ARCH_CHIP_ATSAMD20J18
 
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index ca4ca06348..074234a642 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -1,8 +1,8 @@
 # CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLEBG is not set
+# CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_CMP is not set
 # CONFIG_NSH_DISABLE_DD is not set
-# CONFIG_NSH_DISABLE_DELROUTE is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
 # CONFIG_NSH_DISABLE_GET is not set
@@ -17,22 +17,20 @@
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
-# CONFIG_NSH_DISABLEBG is not set
-# CONFIG_NSH_DISABLESCRIPT is not set
-CONFIG_ARCH_BOARD_SAMD20_XPLAINED=y
-CONFIG_ARCH_BOARD="samd20-xplained"
-CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CHIP_SAMD=y
-CONFIG_ARCH_CHIP_SAMD20J18=y
-CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="samd20-xplained"
+CONFIG_ARCH_BOARD_SAMD20_XPLAINED=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_CHIP_SAMD20J18=y
+CONFIG_ARCH_CHIP_SAMD2X=y
+CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYW=y
 CONFIG_BOARD_LOOPSPERMSEC=3410
 CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_EXAMPLES_NSH=y
+CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
@@ -63,6 +61,6 @@ CONFIG_USART3_TXBUFSIZE=64
 CONFIG_USART4_RXBUFSIZE=64
 CONFIG_USART4_SERIAL_CONSOLE=y
 CONFIG_USART4_TXBUFSIZE=64
-CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_USERMAIN_STACKSIZE=1536
+CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/configs/samd21-xplained/README.txt b/configs/samd21-xplained/README.txt
index 0bfdbf246e..8cef7de0af 100644
--- a/configs/samd21-xplained/README.txt
+++ b/configs/samd21-xplained/README.txt
@@ -361,7 +361,7 @@ SAMD21 Xplained Pro-specific Configuration Options
     CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
        chip:
 
-       CONFIG_ARCH_CHIP_SAMD
+       CONFIG_ARCH_CHIP_SAMD2X
        CONFIG_ARCH_CHIP_SAMD21
        CONFIG_ARCH_CHIP_ATSAMD21J18
 
diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig
index 48a77d2066..2c49e6ad34 100644
--- a/configs/samd21-xplained/nsh/defconfig
+++ b/configs/samd21-xplained/nsh/defconfig
@@ -1,8 +1,8 @@
 # CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLEBG is not set
+# CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_CMP is not set
 # CONFIG_NSH_DISABLE_DD is not set
-# CONFIG_NSH_DISABLE_DELROUTE is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
 # CONFIG_NSH_DISABLE_GET is not set
@@ -17,22 +17,20 @@
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
-# CONFIG_NSH_DISABLEBG is not set
-# CONFIG_NSH_DISABLESCRIPT is not set
-CONFIG_ARCH_BOARD_SAMD21_XPLAINED=y
-CONFIG_ARCH_BOARD="samd21-xplained"
-CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CHIP_SAMD=y
-CONFIG_ARCH_CHIP_SAMD21J18A=y
-CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="samd21-xplained"
+CONFIG_ARCH_BOARD_SAMD21_XPLAINED=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_CHIP_SAMD21J18A=y
+CONFIG_ARCH_CHIP_SAMD2X=y
+CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYW=y
 CONFIG_BOARD_LOOPSPERMSEC=3410
 CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_EXAMPLES_NSH=y
+CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
@@ -63,6 +61,6 @@ CONFIG_USART3_TXBUFSIZE=64
 CONFIG_USART4_RXBUFSIZE=64
 CONFIG_USART4_SERIAL_CONSOLE=y
 CONFIG_USART4_TXBUFSIZE=64
-CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_USERMAIN_STACKSIZE=1536
+CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0
diff --git a/configs/saml21-xplained/README.txt b/configs/saml21-xplained/README.txt
index dcb69896c3..db1ce483b6 100644
--- a/configs/saml21-xplained/README.txt
+++ b/configs/saml21-xplained/README.txt
@@ -533,7 +533,7 @@ SAML21 Xplained Pro-specific Configuration Options
     CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
        chip:
 
-       CONFIG_ARCH_CHIP_SAML
+       CONFIG_ARCH_CHIP_SAML2X
        CONFIG_ARCH_CHIP_SAML21
        CONFIG_ARCH_CHIP_ATSAML21J18
 
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index dc476a9fc0..6891f02d4b 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -1,8 +1,8 @@
 # CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLEBG is not set
+# CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_CMP is not set
 # CONFIG_NSH_DISABLE_DD is not set
-# CONFIG_NSH_DISABLE_DELROUTE is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
 # CONFIG_NSH_DISABLE_GET is not set
@@ -17,22 +17,20 @@
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
-# CONFIG_NSH_DISABLEBG is not set
-# CONFIG_NSH_DISABLESCRIPT is not set
-CONFIG_ARCH_BOARD_SAML21_XPLAINED=y
-CONFIG_ARCH_BOARD="saml21-xplained"
-CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CHIP_SAML=y
-CONFIG_ARCH_CHIP_SAML21J18=y
-CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="saml21-xplained"
+CONFIG_ARCH_BOARD_SAML21_XPLAINED=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_CHIP_SAML21J18=y
+CONFIG_ARCH_CHIP_SAML2X=y
+CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYW=y
 CONFIG_BOARD_LOOPSPERMSEC=4356
 CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_EXAMPLES_NSH=y
+CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
@@ -51,9 +49,9 @@ CONFIG_RAM_START=0x20000000
 CONFIG_RR_INTERVAL=200
 CONFIG_SAMD2L2_SERCOM3=y
 CONFIG_SAMD2L2_SERCOM4=y
+CONFIG_SAML21_XPLAINED_DFLL=y
 CONFIG_SAML21_XPLAINED_DFLL_CLOSEDLOOP=y
 CONFIG_SAML21_XPLAINED_DFLL_XOSC32KSRC=y
-CONFIG_SAML21_XPLAINED_DFLL=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=12
@@ -66,6 +64,6 @@ CONFIG_USART3_TXBUFSIZE=64
 CONFIG_USART4_RXBUFSIZE=64
 CONFIG_USART4_SERIAL_CONSOLE=y
 CONFIG_USART4_TXBUFSIZE=64
-CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_USERMAIN_STACKSIZE=1536
+CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_WDOG_INTRESERVE=0