Skip to contentSkip to conversation

ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE

RFC PATCH New Steve Sakoman 5 participants 7 messages Oct 27, 2010 – Nov 2, 2010

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE

This patch fixes the issue by defining and using CONFIG_SYS_INIT_RAM_SIZE and CONFIG_SYS_INIT_RAM_ADDR. Based on an email discussion with Wolfgang Denk and Heiko Schocher.

---

Tested on Overo. Will test on all available boards later today.

include/configs/igep0020.h +5 -1
index 16d9279..a970ad2 100644
@@ -222,6 +222,10 @@
 #endif /* (CONFIG_CMD_NET) */
 
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_SP_ADDR		(LOW_LEVEL_SRAM_STACK - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_ADDR	0x4020f800
+#define CONFIG_SYS_INIT_RAM_SIZE	0x800
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					 CONFIG_SYS_INIT_RAM_SIZE - \
+					 GENERATED_GBL_DATA_SIZE)
 
 #endif /* __CONFIG_H */
include/configs/igep0030.h +5 -1
index d6fbec7..031de35 100644
@@ -209,6 +209,10 @@
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (128 << 10))
 
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_SP_ADDR		(LOW_LEVEL_SRAM_STACK - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_ADDR	0x4020f800
+#define CONFIG_SYS_INIT_RAM_SIZE	0x800
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					 CONFIG_SYS_INIT_RAM_SIZE - \
+					 GENERATED_GBL_DATA_SIZE)
 
 #endif /* __CONFIG_H */
include/configs/omap3_beagle.h +5 -2
index e7d5bd0..076dd5a 100644
@@ -346,8 +346,11 @@ extern unsigned int boot_flash_sec;
 extern unsigned int boot_flash_type;
 #endif
 
-/* additions for new relocation code, must be added to all boards */
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_SP_ADDR		(LOW_LEVEL_SRAM_STACK - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_ADDR	0x4020f800
+#define CONFIG_SYS_INIT_RAM_SIZE	0x800
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					 CONFIG_SYS_INIT_RAM_SIZE - \
+					 GENERATED_GBL_DATA_SIZE)
 
 #endif /* __CONFIG_H */
include/configs/omap3_overo.h +5 -1
index 052d503..79a5b85 100644
@@ -325,6 +325,10 @@ extern unsigned int boot_flash_type;
 #endif /* (CONFIG_CMD_NET) */
 
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_SP_ADDR		(LOW_LEVEL_SRAM_STACK - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_ADDR	0x4020f800
+#define CONFIG_SYS_INIT_RAM_SIZE	0x800
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					 CONFIG_SYS_INIT_RAM_SIZE - \
+					 GENERATED_GBL_DATA_SIZE)
 
 #endif				/* __CONFIG_H */
include/configs/omap4_panda.h +5 -1
index 9dda2a3..76131fd 100644
@@ -227,6 +227,10 @@
 #define CONFIG_NR_DRAM_BANKS	1
 
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
-#define CONFIG_SYS_INIT_SP_ADDR		(LOW_LEVEL_SRAM_STACK - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_ADDR	0x4030E000
+#define CONFIG_SYS_INIT_RAM_SIZE	0x800
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					 CONFIG_SYS_INIT_RAM_SIZE - \
+					 GENERATED_GBL_DATA_SIZE)
 
 #endif /* __CONFIG_H */
include/configs/omap4_sdp4430.h +5 -1
index 36471ba..3d4d3a7 100644
@@ -245,6 +245,10 @@
 #define CONFIG_NR_DRAM_BANKS	1
 
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
-#define CONFIG_SYS_INIT_SP_ADDR		(LOW_LEVEL_SRAM_STACK - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_ADDR	0x4030E000
+#define CONFIG_SYS_INIT_RAM_SIZE	0x800
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					 CONFIG_SYS_INIT_RAM_SIZE - \
+					 GENERATED_GBL_DATA_SIZE)
 
 #endif /* __CONFIG_H */
#1 lore raw

RFC PATCH 1/1 ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE

Hello Steve,

Quoted 8 lines · Steve Sakoman

This patch fixes the issue by defining and using CONFIG_SYS_INIT_RAM_SIZE and CONFIG_SYS_INIT_RAM_ADDR. Based on an email discussion with Wolfgang Denk and Heiko Schocher.

---

Tested on Overo. Will test on all available boards later today.

Test this patch on my beagle board, works fine:

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#2 lore raw

RFC PATCH 1/1 ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE

Quoted 11 lines

Hello Steve,

Quoted 1 line · Steve Sakoman

This patch fixes the issue by defining and using

CONFIG_SYS_INIT_RAM_SIZE and

Quoted 1 line

CONFIG_SYS_INIT_RAM_ADDR. Based on an email discussion with Wolfgang

Denk and

Quoted 2 lines

Heiko Schocher.

Quoted 9 lines
Quoted 4 lines

---

Tested on Overo. Will test on all available boards later today.

Test this patch on my beagle board, works fine:

Should I consider this a bug fix and add it to my tree?

I believe the patch itself came after the merge window ended

Thanks,
Sandeep

#3 lore raw

RFC PATCH 1/1 ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE

Dear "Paulraj, Sandeep",

Quoted 9 lines · In message <[email protected]> you…
Quoted 5 lines

Test this patch on my beagle board, works fine:

Should I consider this a bug fix and add it to my tree?

I believe the patch itself came after the merge window ended

Yes, all these are bug fixes needed to get the current code working as expected. Please apply. Thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"A great many people think they are thinking when they are merely re-
arranging their prejudices."                          - William James
#4 lore raw

RFC PATCH 1/1 ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE

Quoted 9 lines · Wolfgang Denk

Dear "Paulraj, Sandeep",

Quoted 6 lines · In message <[email protected]> you…
Quoted 5 lines

Test this patch on my beagle board, works fine:

Quoted 6 lines
Quoted 3 lines

Should I consider this a bug fix and add it to my tree?

I believe the patch itself came after the merge window ended

Yes, all these are bug fixes needed to get the current code working as expected. Please apply. Thanks.

Sandeep, there are a couple of other pending patches that are build fixers:

ARMV7: OMAP3: IGEP: Rename TEXT_BASE
ARMV7: Fix build for non-OMAP3 boards

They've been posted to the list for a few days now, and are also sitting in my omap4-next-upstream branch.

Steve

#5 lore raw

RFC PATCH 1/1 ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE

Quoted 24 lines · Wolfgang Denk
Quoted 3 lines

Dear "Paulraj, Sandeep",

In message <[email protected]>

Quoted 6 lines · you
Quoted 6 lines
Quoted 5 lines

Test this patch on my beagle board, works fine:

Quoted 6 lines
Quoted 3 lines

Should I consider this a bug fix and add it to my tree?

I believe the patch itself came after the merge window ended

Yes, all these are bug fixes needed to get the current code working as expected. Please apply. Thanks.

Sandeep, there are a couple of other pending patches that are build fixers:

Quoted 8 lines

ARMV7: OMAP3: IGEP: Rename TEXT_BASE
ARMV7: Fix build for non-OMAP3 boards

They've been posted to the list for a few days now, and are also sitting in my omap4-next-upstream branch.

Steve

Yes I have seen them. Pull request will be sent on Saturday or Sunday.

Sandeep

#6 lore raw

RFC PATCH 1/1 ARMV7: OMAP: Fix build after introduction of GENERATED_GBL_DATA_SIZE

Quoted 27 lines · Sandeep
Quoted 27 lines · Wolfgang Denk
Quoted 3 lines

Dear "Paulraj, Sandeep",

In message <[email protected]>

Quoted 6 lines · you
Quoted 6 lines
Quoted 5 lines

Test this patch on my beagle board, works fine:

Quoted 6 lines
Quoted 3 lines

Should I consider this a bug fix and add it to my tree?

I believe the patch itself came after the merge window ended

Yes, all these are bug fixes needed to get the current code working as expected. ?Please apply. ?Thanks.

Sandeep, there are a couple of other pending patches that are build fixers:

ARMV7: OMAP3: IGEP: Rename TEXT_BASE
ARMV7: Fix build for non-OMAP3 boards

Quoted 7 lines
Quoted 5 lines

They've been posted to the list for a few days now, and are also sitting in my omap4-next-upstream branch.

Steve

Yes I have seen them. Pull request will be sent on Saturday or Sunday.

Any update on this? It would be good to get mainline in a build-able state again.

Steve