Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / configs / bg0900_defconfig

diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig
index 24e8bbde17f098878c2da551d3a95a4541e4e89a..fa8f6dcba8f56591792878d70bc3558a7dd79ac0 100644 (file)
--- a/configs/bg0900_defconfig
+++ b/configs/bg0900_defconfig
@@ -1,9 +1,12 @@
 CONFIG_ARM=y
-CONFIG_TARGET_BG0900=y
+CONFIG_ARCH_MX28=y
+CONFIG_SYS_TEXT_BASE=0x40002000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TARGET_BG0900=y
 CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyAMA0,115200"
@@ -11,13 +14,11 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_SPL=y
+# CONFIG_SPL_FRAMEWORK is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
-CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
@@ -27,7 +28,12 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_DOS_PARTITION=y
 # CONFIG_MMC is not set
+CONFIG_NAND=y
+CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_CONS_INDEX=0
+CONFIG_SPI=y
+CONFIG_MXS_SPI=y
 CONFIG_OF_LIBFDT=y