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

[u-boot] / configs / devkit8000_defconfig

diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index a45bd993cb34d12f183b34f63d299289a184ed4b..4a096b92659751a621056de15892b16b27af31dc 100644 (file)
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -1,24 +1,33 @@
 CONFIG_ARM=y
-CONFIG_OMAP34XX=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_SYS_TEXT_BASE=0x80100000
 CONFIG_TARGET_DEVKIT8000=y
+CONFIG_SPL=y
+CONFIG_DISTRO_DEFAULTS=y
+# CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL=y
 CONFIG_SPL_OS_BOOT=y
-CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMI is not set
-# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x680000
+CONFIG_CMD_SPL_WRITE_SIZE=0x400
 # CONFIG_CMD_FLASH is not set
-CONFIG_CMD_MMC=y
 CONFIG_CMD_I2C=y
-# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_LOCK_UNLOCK=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_FAT=y
-CONFIG_ISO_PARTITION=y
+CONFIG_BOOTP_NTPSERVER=y
+CONFIG_CMD_JFFS2=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
+CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MMC_OMAP_HS=y
+CONFIG_NAND=y
+CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
+CONFIG_SPL_NAND_SIMPLE=y
+CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y