Merge branch 'next' of ../custodians into next

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

diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h
index a928c2cfbb09330a57ba5572ad03b1484fb011cf..8673e6ff64dbce957de46b4f9c88dfee7d468950 100644 (file)
--- a/include/configs/km_arm.h
+++ b/include/configs/km_arm.h
@@ -127,9 +127,9 @@
 #define CONFIG_NETCONSOLE      /* include NetConsole support   */
 #define CONFIG_NET_MULTI       /* specify more that one ports available */
 #define CONFIG_MII             /* expose smi ove miiphy interface */
-#define CONFIG_KIRKWOOD_EGIGA  /* Enable kirkwood Gbe Controller Driver */
+#define CONFIG_MVGBE           /* Enable Marvell Gbe Controller Driver */
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using phy */
-#define CONFIG_KIRKWOOD_EGIGA_PORTS    {1,0}   /* enable port 0 only */
+#define CONFIG_MVGBE_PORTS     {1, 0}  /* enable port 0 only */
 #define CONFIG_PHY_BASE_ADR    0
 #define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */
 #define CONFIG_RESET_PHY_R     /* use reset_phy() to init 88E1118 PHY */
@@ -142,16 +142,8 @@
 /*
  * I2C related stuff
  */
-#undef CONFIG_HARD_I2C         /* I2C with hardware support */
 #define        CONFIG_SOFT_I2C         /* I2C bit-banged       */
 
-#if defined(CONFIG_HARD_I2C)
-#define        CONFIG_I2C_KIRKWOOD
-#define        CONFIG_I2C_KW_REG_BASE          KW_TWSI_BASE
-#define        CONFIG_SYS_I2C_SLAVE            0x0
-#define        CONFIG_SYS_I2C_SPEED            100000
-#endif
-
 #define        CONFIG_KIRKWOOD_GPIO            /* Enable GPIO Support */
 #if defined(CONFIG_SOFT_I2C)
 #ifndef __ASSEMBLY__
@@ -188,4 +180,8 @@ int get_scl (void);
 #undef CONFIG_JFFS2_CMDLINE
 #endif
 
+/* additions for new relocation code, must added to all boards */
+#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CONFIG_SYS_INIT_SP_ADDR                (0x00000000 + 0x1000 - /* Fix this */ \
+                                       CONFIG_SYS_GBL_DATA_SIZE)
 #endif /* _CONFIG_KM_ARM_H */