[U-Boot] [PATCH RFC] 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.
Signed-off-by: Steve Sakoman steve.sakoman@linaro.org ---
Tested on Overo. Will test on all available boards later today.
diff --git a/include/configs/igep0020.h b/include/configs/igep0020.h index 16d9279..a970ad2 100644 --- a/include/configs/igep0020.h +++ b/include/configs/igep0020.h @@ -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 */ diff --git a/include/configs/igep0030.h b/include/configs/igep0030.h index d6fbec7..031de35 100644 --- a/include/configs/igep0030.h +++ b/include/configs/igep0030.h @@ -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 */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index e7d5bd0..076dd5a 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 052d503..79a5b85 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -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 */ diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 9dda2a3..76131fd 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -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 */ diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index 36471ba..3d4d3a7 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -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 */
Hello Steve,
Steve Sakoman wrote:
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.
Signed-off-by: Steve Sakoman steve.sakoman@linaro.org
Tested on Overo. Will test on all available boards later today.
Test this patch on my beagle board, works fine:
Tested-by: Heiko Schocher hs@denx.de
bye, Heiko
Hello Steve,
Steve Sakoman wrote:
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.
Signed-off-by: Steve Sakoman steve.sakoman@linaro.org
Tested on Overo. Will test on all available boards later today.
Test this patch on my beagle board, works fine:
Tested-by: Heiko Schocher hs@denx.de
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
Dear "Paulraj, Sandeep",
In message 0554BEF07D437848AF01B9C9B5F0BC5DA9D898CE@dlee01.ent.ti.com you wrote:
Test this patch on my beagle board, works fine:
Tested-by: Heiko Schocher hs@denx.de
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
On Wed, 2010-10-27 at 17:11 +0200, Wolfgang Denk wrote:
Dear "Paulraj, Sandeep",
In message 0554BEF07D437848AF01B9C9B5F0BC5DA9D898CE@dlee01.ent.ti.com you wrote:
Test this patch on my beagle board, works fine:
Tested-by: Heiko Schocher hs@denx.de
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
On Wed, 2010-10-27 at 17:11 +0200, Wolfgang Denk wrote:
Dear "Paulraj, Sandeep",
In message 0554BEF07D437848AF01B9C9B5F0BC5DA9D898CE@dlee01.ent.ti.com
you wrote:
Test this patch on my beagle board, works fine:
Tested-by: Heiko Schocher hs@denx.de
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
Yes I have seen them. Pull request will be sent on Saturday or Sunday.
Sandeep
On Wed, Oct 27, 2010 at 10:32 AM, Paulraj, Sandeep s-paulraj@ti.com wrote:
On Wed, 2010-10-27 at 17:11 +0200, Wolfgang Denk wrote:
Dear "Paulraj, Sandeep",
In message 0554BEF07D437848AF01B9C9B5F0BC5DA9D898CE@dlee01.ent.ti.com
you wrote:
Test this patch on my beagle board, works fine:
Tested-by: Heiko Schocher hs@denx.de
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
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
participants (5)
-
Heiko Schocher -
Paulraj, Sandeep -
Steve Sakoman -
Steve Sakoman -
Wolfgang Denk