Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig

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

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 81b79b20e38055ba14090fbe2212a3719562ff05..531f5bf5aab4c886f90f45acf3a8e2f3ad2ee183 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -19,9 +19,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
 #define CONFIG_MXC_UART
 
 #ifdef CONFIG_SPL
@@ -58,12 +55,8 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_MXC_UART_BASE   UART2_BASE
-#define CONFIG_BAUDRATE             115200
 
 /* Command definition */
-
-#define CONFIG_CMD_BMODE
-#define CONFIG_CMD_BOOTZ
 #undef CONFIG_CMD_IMLS
 
 #define CONFIG_BOARD_NAME      EL6Q
@@ -73,7 +66,7 @@
        "board="__stringify(CONFIG_BOARD_NAME)"\0"                              \
        "cma_size="__stringify(EL6Q_CMA_SIZE)"\0"                               \
        "chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0"                     \
-       "console=" CONFIG_CONSOLE_DEV "\0"                                      \
+       "console=" CONSOLE_DEV "\0"                                     \
        "fdtfile=undefined\0" \
        "fdt_high=0xffffffff\0" \
        "fdt_addr_r=0x18000000\0" \
@@ -104,8 +97,6 @@
 #define CONFIG_SYS_MEMTEST_END         0x10800000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
 
-#define CONFIG_STACKSIZE               (128 * 1024)
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
@@ -119,13 +110,10 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
+/* environment organization */
 
 #define CONFIG_ENV_SIZE                        (8 * 1024)
 
-#define CONFIG_ENV_IS_IN_MMC
-
 #if defined(CONFIG_ENV_IS_IN_MMC)
 #define CONFIG_SYS_MMC_ENV_DEV         1
 #define CONFIG_SYS_MMC_ENV_PART                2