Merge git://www.denx.de/git/u-boot-marvell

[u-boot] / configs / nitrogen6s_defconfig

diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index efeab496430e5fb4e3955fcc7d76064558bc4ba0..707fb58b34e18508bbbaf8ce654e08a763f521f2 100644 (file)
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -1,3 +1,10 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_GPIO=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_OF_LIBFDT=y