Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 81b79b20e38055ba14090fbe2212a3719562ff05..484565c9aa9d27c00aaaffc81096e71175e555f9 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
@@ -63,7 +60,6 @@
 /* Command definition */
 
 #define CONFIG_CMD_BMODE
-#define CONFIG_CMD_BOOTZ
 #undef CONFIG_CMD_IMLS
 
 #define CONFIG_BOARD_NAME      EL6Q
@@ -73,7 +69,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" \