| Message ID | 1386139975-21656-1-git-send-email-lokeshvutla@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Dec 04, 2013 at 12:22:55PM +0530, Lokesh Vutla wrote: > With the current scenario SPL size is being overlapped with the public > stack and not allowing any OMAP4 device to boot. So the suggestion came > up was to move the TEXT_BASE down to non-HS limit. Fixing the same and > also moving the SRAM_SCRATCH_SPACE_ADDR up to the end of image > downloadable area. > Discussion on this can be seen here: > https://www.mail-archive.com/u-boot@lists.denx.de/msg127147.html > > Tested on OMAP4460 PANDA. > > Reported-by: Chao Xu <caesarxuchao@gmail.com> > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Applied to u-boot-ti/master, thanks!
diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h index e35f51c..f66da0d 100644 --- a/arch/arm/include/asm/arch-omap4/omap.h +++ b/arch/arm/include/asm/arch-omap4/omap.h @@ -116,7 +116,7 @@ struct s32ktimer { */ #define NON_SECURE_SRAM_START 0x40304000 #define NON_SECURE_SRAM_END 0x4030E000 /* Not inclusive */ -#define SRAM_SCRATCH_SPACE_ADDR NON_SECURE_SRAM_START +#define SRAM_SCRATCH_SPACE_ADDR 0x4030C000 /* base address for indirect vectors (internal boot mode) */ #define SRAM_ROM_VECT_BASE 0x4030D000 diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index ea56eeb..d099bfd 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -148,9 +148,14 @@ "fi; " \ "fi" -/* Defines for SPL */ -#define CONFIG_SPL_TEXT_BASE 0x40304350 -#define CONFIG_SPL_MAX_SIZE (38 * 1024) +/* + * Defines for SPL + * It is known that this will break HS devices. Since the current size of + * SPL is overlapped with public stack and breaking non HS devices to boot. + * So moving TEXT_BASE down to non-HS limit. + */ +#define CONFIG_SPL_TEXT_BASE 0x40300000 +#define CONFIG_SPL_MAX_SIZE (0x4030C000 - CONFIG_SPL_TEXT_BASE) #define CONFIG_SPL_DISPLAY_PRINT #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
With the current scenario SPL size is being overlapped with the public stack and not allowing any OMAP4 device to boot. So the suggestion came up was to move the TEXT_BASE down to non-HS limit. Fixing the same and also moving the SRAM_SCRATCH_SPACE_ADDR up to the end of image downloadable area. Discussion on this can be seen here: https://www.mail-archive.com/u-boot@lists.denx.de/msg127147.html Tested on OMAP4460 PANDA. Reported-by: Chao Xu <caesarxuchao@gmail.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- arch/arm/include/asm/arch-omap4/omap.h | 2 +- include/configs/omap4_common.h | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-)