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

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

diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h
index faa0f503266e6a5227bd86b4662d7a4f0d38b248..bf77cc0542600ee59172e2d57311e65a59c47d99 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
@@ -182,6 +181,8 @@ int get_scl (void);
 
 /* additions for new relocation code, must be 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)
+/* 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 */