diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index 876ab280f6..0172755836 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -157,10 +157,13 @@ CONFIG_SAMDL_HAVE_TC3=y
 #
 # SAMD/L Peripheral Support
 #
-# CONFIG_SAMDL_WDT is not set
-# CONFIG_SAMDL_RTC is not set
-# CONFIG_SAMDL_NVMCTRL is not set
+# CONFIG_SAMDL_AC is not set
+# CONFIG_SAMDL_ADC is not set
+# CONFIG_SAMDL_DAC is not set
 # CONFIG_SAMDL_EVSYS is not set
+# CONFIG_SAMDL_NVMCTRL is not set
+# CONFIG_SAMDL_PTC is not set
+# CONFIG_SAMDL_RTC is not set
 # CONFIG_SAMDL_SERCOM0 is not set
 # CONFIG_SAMDL_SERCOM1 is not set
 # CONFIG_SAMDL_SERCOM2 is not set
@@ -173,10 +176,7 @@ CONFIG_SAMDL_SERCOM4=y
 # CONFIG_SAMDL_TC3 is not set
 # CONFIG_SAMDL_TC4 is not set
 # CONFIG_SAMDL_TC5 is not set
-# CONFIG_SAMDL_ADC is not set
-# CONFIG_SAMDL_AC is not set
-# CONFIG_SAMDL_DAC is not set
-# CONFIG_SAMDL_PTC is not set
+# CONFIG_SAMDL_WDT is not set
 # CONFIG_SAMDL_SERCOM3_ISI2C is not set
 # CONFIG_SAMDL_SERCOM3_ISSPI is not set
 CONFIG_SAMDL_SERCOM3_ISUSART=y
@@ -532,6 +532,7 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # System Logging
@@ -654,7 +655,6 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
@@ -674,7 +674,6 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SMART is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_WEBSERVER is not set
@@ -706,7 +705,6 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_THTTPD is not set
 
 #
 # FreeModBus