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

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

diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 2260338..be8c9f8 100644 (file)
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -40,6 +40,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F 1            /* Call board_early_init_f      */
 #define        CONFIG_MISC_INIT_F      1               /* and misc_init_f()            */
+#define        CONFIG_MISC_INIT_R      1               /* and misc_init_r()            */
 
 #define CONFIG_SYS_CLK_FREQ    33333333        /* external frequency to pll    */
 
@@ -65,8 +66,10 @@
 #define CONFIG_LOADS_ECHO      1               /* echo on for serial download  */
 #undef CONFIG_SYS_LOADS_BAUD_CHANGE                    /* disallow baudrate change     */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1               /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0               /* PHY address                  */
+#define CONFIG_NET_MULTI
 
 #define CONFIG_RTC_M48T35A     1               /* ST Electronics M48 timekeeper */
 #define CONFIG_DTT_LM75     1                /* ON Semi's LM75 */
@@ -138,8 +141,6 @@
 /* The following table includes the supported baudrates */
 #define CONFIG_SYS_BAUDRATE_TABLE      {9600}
 
-#define CONFIG_SYS_CLKS_IN_HZ          1               /* everything, incl board info, in Hz */
-
 #define CONFIG_SYS_LOAD_ADDR           0x100000        /* default load address         */
 #define CONFIG_SYS_EXTBDINFO           1               /* use extended board_info (bd_t) */
 
@@ -214,9 +215,9 @@
 #define CONFIG_SYS_EBC_PB5CR   0xFD87A000
 
 /* bank 6 is unused */
-/* pb6ap = 0 */
+/* PB6AP = 0 */
 #define CONFIG_SYS_EBC_PB6AP   0x00000000
-/* pb6cr = 0 */
+/* PB6CR = 0 */
 #define CONFIG_SYS_EBC_PB6CR   0x00000000
 
 /* bank 7 is LED register */
@@ -279,6 +280,7 @@
  * I2C EEPROM (ATMEL 24C04N)
  */
 #define CONFIG_HARD_I2C                1               /* Hardware assisted I2C        */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED           400000          /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F