Merge git://git.denx.de/u-boot-dm

[J-u-boot.git] / configs / tricorder_defconfig

diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index 5c1837cc0b7d4f0751e7e72562208d473fd58ea8..0f6cccc3023b045855fc7f22a275d6b4da739247 100644 (file)
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -1,20 +1,43 @@
 CONFIG_ARM=y
 CONFIG_ARM=y

-CONFIG_OMAP34XX=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_SYS_TEXT_BASE=0x80100000

 CONFIG_TARGET_TRICORDER=y
 CONFIG_BOOTDELAY=0
 CONFIG_TARGET_TRICORDER=y
 CONFIG_BOOTDELAY=0

+CONFIG_SILENT_CONSOLE=y

 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="OMAP3 Tricorder # "
 # CONFIG_CMD_IMI is not set
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="OMAP3 Tricorder # "
 # CONFIG_CMD_IMI is not set

-# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_EEPROM=y

 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FLASH is not set

-CONFIG_CMD_MMC=y
-CONFIG_CMD_I2C=y

 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_FPGA is not set

+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_LOCK_UNLOCK=y

 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y

+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),1m(u-boot),384k(u-boot-env1),1152k(mtdoops),384k(u-boot-env2),5m(kernel),2m(fdt),-(ubi)"
+CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_LED_STATUS=y
+CONFIG_LED_STATUS0=y
+CONFIG_LED_STATUS_BIT=1
+CONFIG_LED_STATUS_STATE=2
+CONFIG_LED_STATUS1=y
+CONFIG_LED_STATUS_BIT1=2
+CONFIG_LED_STATUS_STATE1=2
+CONFIG_LED_STATUS2=y
+CONFIG_LED_STATUS_BIT2=4
+CONFIG_LED_STATUS_STATE2=2
+CONFIG_LED_STATUS_CMD=y
+CONFIG_MMC_OMAP_HS=y
+CONFIG_NAND=y
+CONFIG_SPL_NAND_SIMPLE=y

 CONFIG_SYS_NS16550=y
 CONFIG_SYS_NS16550=y

+CONFIG_BCH=y

 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y