[PATCH 05/11] arm: Stop using CONFIG_SYS_GBL_DATA_OFFSET

[Tom Rini]

This value is only referenced by PowerPC code in a way other than
directly as CONFIG_SYS_INIT_SP_ADDR.  Switch to CONFIG_SYS_INIT_SP_ADDR
directly.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
 include/configs/integrator-common.h | 3 +--
 include/configs/vexpress_common.h   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index d578b0246051..927daa71ad18 100644
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -32,10 +32,9 @@
 #define PHYS_SDRAM_1_SIZE	0x08000000	/* 128 MB */
 #define CONFIG_SYS_SDRAM_BASE	PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_SIZE PHYS_SDRAM_1_SIZE
-#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + \
+#define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_SDRAM_BASE + \
 				    CONFIG_SYS_INIT_RAM_SIZE - \
 				    GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET
 
 /*
  * FLASH and environment organization
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index f27280af99ef..86cb56e7a189 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -139,10 +139,9 @@
 /* additions for new relocation code */
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_SIZE		0x1000
-#define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_SDRAM_BASE + \
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + \
 					 CONFIG_SYS_INIT_RAM_SIZE - \
 					 GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR		CONFIG_SYS_GBL_DATA_OFFSET
 
 /* Basic environment settings */
 #define BOOT_TARGET_DEVICES(func) \
-- 
2.25.1