Convert CONFIG_CMD_JFFS2 to Kconfig

[people/ms/u-boot.git] / include / configs / tricorder.h

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index a300f388576932105ff3f5b5024d128b4110f45f..d18a333d011b370ed46203ec942f632725e75bcc 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -16,14 +16,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* High Level Configuration Options */
-#define CONFIG_SYS_THUMB_BUILD
-#define CONFIG_OMAP                    /* in a TI OMAP core */
-/* Common ARM Erratas */
-#define CONFIG_ARM_ERRATA_454179
-#define CONFIG_ARM_ERRATA_430973
-#define CONFIG_ARM_ERRATA_621766
-
+#define CONFIG_MACH_TYPE               MACH_TYPE_TRICORDER
 /*
  * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
  * 64 bytes before this address should be set aside for u-boot.img's
@@ -53,26 +46,6 @@
 
 /* Hardware drivers */
 
-/* GPIO support */
-#define CONFIG_OMAP_GPIO
-
-/* GPIO banks */
-#define CONFIG_OMAP3_GPIO_2            /* GPIO32..63 are in GPIO bank 2 */
-
-/* LED support */
-#define CONFIG_STATUS_LED
-#define CONFIG_BOARD_SPECIFIC_LED
-#define CONFIG_CMD_LED                 /* LED command */
-#define STATUS_LED_BIT                 (1 << 0)
-#define STATUS_LED_STATE               STATUS_LED_ON
-#define STATUS_LED_PERIOD              (CONFIG_SYS_HZ / 2)
-#define STATUS_LED_BIT1                        (1 << 1)
-#define STATUS_LED_STATE1              STATUS_LED_ON
-#define STATUS_LED_PERIOD1             (CONFIG_SYS_HZ / 2)
-#define STATUS_LED_BIT2                        (1 << 2)
-#define STATUS_LED_STATE2              STATUS_LED_ON
-#define STATUS_LED_PERIOD2             (CONFIG_SYS_HZ / 2)
-
 /* NS16550 Configuration */
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
@@ -82,14 +55,9 @@
 #define CONFIG_CONS_INDEX              3
 #define CONFIG_SYS_NS16550_COM3                OMAP34XX_UART3
 #define CONFIG_SERIAL3                 3
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
-/* MMC */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_DOS_PARTITION
-
 /* I2C */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
@@ -98,16 +66,13 @@
  
 
 /* EEPROM */
-#define CONFIG_CMD_EEPROM
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2
 #define CONFIG_SYS_EEPROM_BUS_NUM      1
 
 /* TWL4030 */
-#define CONFIG_TWL4030_POWER
 #define CONFIG_TWL4030_LED
 
 /* Board NAND Info */
-#define CONFIG_SYS_NO_FLASH            /* no NOR flash */
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
 #define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:" \
@@ -139,8 +104,6 @@
 #define CONFIG_CMD_UBIFS               /* UBIFS commands */
 #define CONFIG_LZO                     /* LZO is needed for UBIFS */
 
-#undef CONFIG_CMD_JFFS2                        /* JFFS2 Support */
-
 /* needed for ubi */
 #define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE       /* needed for mtdparts commands */
@@ -307,7 +270,6 @@
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC