[U-Boot] [PATCH] arm926ejs, kirkwood: fix suen3 board port

[Heiko Schocher]

- use GENERATED_GBL_DATA_SIZE
- move CONFIG_SYS_KWD_CONFIG definition to
  include/configs/km_arm.h because this is arm only
- move CONFIG_SYS_TEXT_BASE definition to
  include/configs/km_arm.h, because this default value
  is only for arm valid.

Signed-off-by: Heiko Schocher <hs at denx.de>
---
 include/configs/keymile-common.h |   16 ----------------
 include/configs/km_arm.h         |   20 +++++++++++++++++++-
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index ccc71c9..62d21f6 100644
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -30,22 +30,6 @@
 #define CONFIG_BOOTCOUNT_LIMIT
 
 /*
- * By default kwbimage.cfg from board specific folder is used
- * If for some board, different configuration file need to be used,
- * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file
- */
-#ifndef CONFIG_SYS_KWD_CONFIG
-#define	CONFIG_SYS_KWD_CONFIG	$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg 
-#endif /* CONFIG_SYS_KWD_CONFIG */
-
-/* 
- * CONFIG_SYS_TEXT_BASE can be defined in board specific header file, if needed
- */
-#ifndef CONFIG_SYS_TEXT_BASE
-#define	CONFIG_SYS_TEXT_BASE	0x00400000
-#endif /* CONFIG_SYS_TEXT_BASE */
-
-/*
  * Command line configuration.
  */
 #include <config_cmd_default.h>
diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h
index bf77cc0..356eb7d 100644
--- a/include/configs/km_arm.h
+++ b/include/configs/km_arm.h
@@ -42,6 +42,24 @@
 
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
+
+/*
+ * By default kwbimage.cfg from board specific folder is used
+ * If for some board, different configuration file need to be used,
+ * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file
+ */
+#ifndef CONFIG_SYS_KWD_CONFIG
+#define	CONFIG_SYS_KWD_CONFIG	$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg 
+#endif /* CONFIG_SYS_KWD_CONFIG */
+
+/* 
+ * CONFIG_SYS_TEXT_BASE can be defined in board specific header file, if needed
+ */
+#ifndef CONFIG_SYS_TEXT_BASE
+#define	CONFIG_SYS_TEXT_BASE	0x04000000
+#endif /* CONFIG_SYS_TEXT_BASE */
+
+
 #undef CONFIG_CMD_DTT
 #undef CONFIG_BOOTCOUNT_LIMIT
 
@@ -182,7 +200,7 @@ int get_scl (void);
 /* 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
+#define CONFIG_SYS_INIT_SP_ADDR		(0xC8012000 - GENERATED_GBL_DATA_SIZE)
 /* Do early setups now in board_init_f() */
 #define CONFIG_BOARD_EARLY_INIT_F
 #endif /* _CONFIG_KM_ARM_H */
-- 
1.7.2.3