diff -raNu old/configs/at91sam9x5ek_nandflash_defconfig new/configs/at91sam9x5ek_nandflash_defconfig
--- old/configs/at91sam9x5ek_nandflash_defconfig	2017-05-04 14:33:41.143172324 -0500
+++ new/configs/at91sam9x5ek_nandflash_defconfig	2017-05-04 17:54:27.132377607 -0500
@@ -1,9 +1,9 @@
 CONFIG_ARM=y
 CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9X5EK=y
-CONFIG_SPL=y
+CONFIG_SPL=n
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9X5,SYS_USE_NANDFLASH"
-CONFIG_BOOTDELAY=3
+CONFIG_BOOTDELAY=0
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_CMD_BOOTZ=y
@@ -23,3 +23,12 @@
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
+
+CONFIG_OF_CONTROL=n
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_I2C=y