diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig
index 9315e8e9c3..be170e25e0 100644
--- a/configs/samd21-xplained/nsh/defconfig
+++ b/configs/samd21-xplained/nsh/defconfig
@@ -28,9 +28,9 @@ CONFIG_BUILD_FLAT=y
 # Binary Output Formats
 #
 # CONFIG_RRLOAD_BINARY is not set
-# CONFIG_INTELHEX_BINARY is not set
+CONFIG_INTELHEX_BINARY=y
 # CONFIG_MOTOROLA_SREC is not set
-CONFIG_RAW_BINARY=y
+# CONFIG_RAW_BINARY is not set
 # CONFIG_UBOOT_UIMAGE is not set
 
 #
@@ -228,6 +228,7 @@ CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -835,7 +836,6 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_RAMTRON is not set
 # CONFIG_SYSTEM_SDCARD is not set
 # CONFIG_SYSTEM_SUDOKU is not set