Merge branch 'master' of git://git.denx.de/u-boot-sunxi

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

diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index 622b7c79e646aee6b72de00f6a414080d670fd25..9f8f60c2c179dcaddefc99c113b2c4c6f2772010 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
 
@@ -132,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       */