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

[platform/kernel/u-boot.git] / include / configs / redwood.h

diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index 84d1e58..9f8f60c 100644 (file)
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -14,7 +14,6 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_440                     1       /* ... PPC460 family    */
 #define CONFIG_460SX                   1       /* ... PPC460 family    */
-#define CONFIG_BOARD_EARLY_INIT_F      1       /* Call board_pre_init  */
 
 #define        CONFIG_SYS_TEXT_BASE    0xfffb0000
 
@@ -120,7 +119,6 @@
        CONFIG_AMCC_DEF_ENV                                             \
        CONFIG_AMCC_DEF_ENV_POWERPC                                     \
        CONFIG_AMCC_DEF_ENV_NOR_UPD                                     \
-       CONFIG_AMCC_DEF_ENV_NAND_UPD                                    \
        "kernel_addr=fc000000\0"                                        \
        "fdt_addr=fc1e0000\0"                                           \
        "ramdisk_addr=fc200000\0"                                       \
@@ -133,7 +131,6 @@
 
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
 #define        CONFIG_IBM_EMAC4_V4     1
 #define CONFIG_PHY_RESET       1       /* reset phy upon startup       */