From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Korsgaard Date: Fri, 31 May 2013 22:56:52 +0200 Subject: [U-Boot] [PATCH 2/3] am33xx: Correct NON_SECURE_SRAM_START/END In-Reply-To: <1370024339-28355-2-git-send-email-trini@ti.com> (Tom Rini's message of "Fri, 31 May 2013 14:18:58 -0400") References: <1370024339-28355-1-git-send-email-trini@ti.com> <1370024339-28355-2-git-send-email-trini@ti.com> Message-ID: <87hahix3zf.fsf@dell.be.48ers.dk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de >>>>> "Tom" == Tom Rini writes: Tom> Prior to Sricharan's cleanup of the boot parameter saving code, we Tom> did not make use of NON_SECURE_SRAM_START on am33xx, so it wasn't a Tom> problem that the address was pointing to the middle of our running SPL. Tom> Correct to point to the base location of the download image area. Tom> Increase CONFIG_SPL_TEXT_BASE to account for this scratch area being Tom> used. As part of correcting these tests, make use of the fact that Tom> we've always been placing our stack outside of the download image area Tom> (which is fine, once the downloaded image is run, ROM is gone) so Tom> correct the max size test to be the ROM defined top of the download area Tom> to where we link/load at. Tom> Signed-off-by: Tom Rini Tom> --- Tom> arch/arm/include/asm/arch-am33xx/omap.h | 4 ++-- Tom> include/configs/am335x_evm.h | 10 ++++++++-- Tom> include/configs/igep0033.h | 10 ++++++++-- Tom> include/configs/pcm051.h | 10 ++++++++-- Tom> 4 files changed, 26 insertions(+), 8 deletions(-) Tom> diff --git a/arch/arm/include/asm/arch-am33xx/omap.h b/arch/arm/include/asm/arch-am33xx/omap.h Tom> index 7e3bb9c..db15159 100644 Tom> --- a/arch/arm/include/asm/arch-am33xx/omap.h Tom> +++ b/arch/arm/include/asm/arch-am33xx/omap.h Tom> @@ -29,8 +29,8 @@ Tom> * at 0x40304000(EMU base) so that our code works for both EMU and GP Tom> */ Tom> #ifdef CONFIG_AM33XX Tom> -#define NON_SECURE_SRAM_START 0x40304000 Tom> -#define NON_SECURE_SRAM_END 0x4030E000 Tom> +#define NON_SECURE_SRAM_START 0x402F0400 Tom> +#define NON_SECURE_SRAM_END 0x40310000 Tom> #elif defined(CONFIG_TI814X) Tom> #define NON_SECURE_SRAM_START 0x40300000 Tom> #define NON_SECURE_SRAM_END 0x40320000 Tom> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h Tom> index f019134..a4777c7 100644 Tom> --- a/include/configs/am335x_evm.h Tom> +++ b/include/configs/am335x_evm.h Tom> @@ -305,8 +305,14 @@ Tom> /* Defines for SPL */ Tom> #define CONFIG_SPL Tom> #define CONFIG_SPL_FRAMEWORK Tom> -#define CONFIG_SPL_TEXT_BASE 0x402F0400 Tom> -#define CONFIG_SPL_MAX_SIZE (101 * 1024) Tom> +/* Tom> + * Place the image at the start of the ROM defined image space and leave Tom> + * space for SRAM scratch entries (see arch/arm/include/omap_common.h). Tom> + * We limit our size to the ROM-defined dowloaded image area, and use the s/dowloaded/downloaded/ Tom> + * rest of the space for stack. Tom> + */ Tom> +#define CONFIG_SPL_TEXT_BASE 0x402F0500 Tom> +#define CONFIG_SPL_MAX_SIZE (0x4030C000 - CONFIG_SPL_TEXT_BASE) Tom> #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR Tom> #define CONFIG_SPL_BSS_START_ADDR 0x80000000 Tom> diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h Tom> index 1912d7d..dd26d9c 100644 Tom> --- a/include/configs/igep0033.h Tom> +++ b/include/configs/igep0033.h Tom> @@ -214,8 +214,14 @@ Tom> /* Defines for SPL */ Tom> #define CONFIG_SPL Tom> #define CONFIG_SPL_FRAMEWORK Tom> -#define CONFIG_SPL_TEXT_BASE 0x402F0400 Tom> -#define CONFIG_SPL_MAX_SIZE (101 * 1024) Tom> +/* Tom> + * Place the image at the start of the ROM defined image space and leave Tom> + * space for SRAM scratch entries (see arch/arm/include/omap_common.h). Tom> + * We limit our size to the ROM-defined dowloaded image area, and use the s/dowloaded/downloaded/ Tom> + * rest of the space for stack. Tom> + */ Tom> +#define CONFIG_SPL_TEXT_BASE 0x402F0500 Tom> +#define CONFIG_SPL_MAX_SIZE (0x4030C000 - CONFIG_SPL_TEXT_BASE) Tom> #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR Tom> #define CONFIG_SPL_BSS_START_ADDR 0x80000000 Tom> diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h Tom> index 478f805..a7d01f1 100644 Tom> --- a/include/configs/pcm051.h Tom> +++ b/include/configs/pcm051.h Tom> @@ -204,8 +204,14 @@ Tom> /* Defines for SPL */ Tom> #define CONFIG_SPL Tom> #define CONFIG_SPL_FRAMEWORK Tom> -#define CONFIG_SPL_TEXT_BASE 0x402F0400 Tom> -#define CONFIG_SPL_MAX_SIZE (101 * 1024) Tom> +/* Tom> + * Place the image at the start of the ROM defined image space and leave Tom> + * space for SRAM scratch entries (see arch/arm/include/omap_common.h). Tom> + * We limit our size to the ROM-defined dowloaded image area, and use the s/dowloaded/downloaded/ Otherwise it looks good. Reviewed-by: Peter Korsgaard -- Bye, Peter Korsgaard