treewide: Migrate CONFIG_SYS_ALT_MEMTEST to Kconfig

[u-boot] / include / configs / tricorder.h

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 33071ef507b9d99715098dc1348b89f5b4be9cc3..9e7fadb2fa2695c480d44e474372ee671aee32e8 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -23,7 +23,6 @@
  * header. That is 0x800FFFC0--0x80100000 should not be used for any
  * other needs.
  */
-#define CONFIG_SYS_TEXT_BASE           0x80100000
 
 #include <asm/arch/cpu.h>              /* get chip and board defs */
 #include <asm/arch/omap.h>
@@ -50,7 +49,6 @@
 #define CONFIG_SYS_NS16550_CLK         48000000 /* 48MHz (APLL96/2) */
 
 /* select serial console configuration */
-#define CONFIG_CONS_INDEX              3
 #define CONFIG_SYS_NS16550_COM3                OMAP34XX_UART3
 #define CONFIG_SERIAL3                 3
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
@@ -58,8 +56,6 @@
 
 /* I2C */
 #define CONFIG_SYS_I2C
-#define CONFIG_SYS_OMAP24_I2C_SPEED    100000
-#define CONFIG_SYS_OMAP24_I2C_SLAVE    1
  
 
 /* EEPROM */
@@ -71,18 +67,7 @@
 
 /* Board NAND Info */
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
-#define 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)"
-
-#define CONFIG_NAND_OMAP_GPMC
+
 #define CONFIG_SYS_NAND_ADDR           NAND_BASE       /* physical address */
                                                        /* to access nand */
 #define CONFIG_SYS_NAND_BASE           NAND_BASE       /* physical address */
@@ -101,7 +86,6 @@
 
 
 /* hang() the board on panic() */
-#define CONFIG_PANIC_HANG
 
 /* environment placement (for NAND), is different for FLASHCARD but does not
  * harm there */
@@ -120,8 +104,8 @@
        "vram=3M\0" \
        "defaultdisplay=lcd\0" \
        "kernelopts=mtdoops.mtddev=3\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
-       "mtdids=" MTDIDS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
        "commonargs=" \
                "setenv bootargs console=${console} " \
                "${mtdparts} " \
@@ -204,9 +188,6 @@
 #endif /* CONFIG_FLASHCARD */
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_CMDLINE_EDITING         /* enable cmdline history */
-#define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 
 #define CONFIG_SYS_MEMTEST_START       (OMAP34XX_SDRC_CS0 + 0x00000000)
@@ -243,8 +224,6 @@
 #define CONFIG_SYS_SRAM_SIZE           0x10000
 
 /* Defines for SPL */
-#define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_NAND_SIMPLE
 
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
@@ -285,6 +264,5 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x100000        /* 1 MB */
 
-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x81000000
 #endif /* __CONFIG_H */