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

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

diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h
index 6519c90..bf77cc0 100644 (file)
--- a/include/configs/km_arm.h
+++ b/include/configs/km_arm.h
@@ -108,7 +108,6 @@
 #define CONFIG_KM_CONSOLE_TTY  "ttyS0"
 
 /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE       128
 
 /*
  * Other required minimal configurations
@@ -142,16 +141,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 +179,10 @@ int get_scl (void);
 #undef CONFIG_JFFS2_CMDLINE
 #endif
 
+/* additions for new relocation code, must be added to all boards */
+#define CONFIG_SYS_SDRAM_BASE          0x00000000
+/* Kirkwood has 2k of Security SRAM, use it for SP */
+#define CONFIG_SYS_INIT_SP_ADDR                0xC8012000
+/* Do early setups now in board_init_f() */
+#define CONFIG_BOARD_EARLY_INIT_F
 #endif /* _CONFIG_KM_ARM_H */