| Message ID | 20160830190629.13956-8-afd@ti.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
On Wednesday 31 August 2016 12:36 AM, Andrew F. Davis wrote: > The SPL load address changes based on boot time in HS devices, > ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs > for similar reasons. Add this same logic for AM33xx devices. > > Also make the default value for ISW_ENTRY_ADDR correct for GP > devices based on SoC, HS devices already pick the correct > value in their defconfig. > > Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Lokesh Vutla <lokeshvutla@ti.com> Thanks and regards, Lokesh > --- > arch/arm/cpu/armv7/am33xx/Kconfig | 3 ++- > include/configs/ti_am335x_common.h | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/cpu/armv7/am33xx/Kconfig b/arch/arm/cpu/armv7/am33xx/Kconfig > index e57e6fb..79c05dd 100644 > --- a/arch/arm/cpu/armv7/am33xx/Kconfig > +++ b/arch/arm/cpu/armv7/am33xx/Kconfig > @@ -108,7 +108,8 @@ config ISW_ENTRY_ADDR > point address depending on the device type > (secure/non-secure), boot media (xip/non-xip) and > image headers. > - default 0x402F4000 > + default 0x402F4000 if AM43XX > + default 0x402F0400 if AM33XX > > config PUB_ROM_DATA_SIZE > hex "Size in bytes of the L3 SRAM reserved by ROM to store data" > diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h > index 349d410..dba40fc 100644 > --- a/include/configs/ti_am335x_common.h > +++ b/include/configs/ti_am335x_common.h > @@ -56,7 +56,7 @@ > * supports X-MODEM loading via UART, and we leverage this and then use > * Y-MODEM to load u-boot.img, when booted over UART. > */ > -#define CONFIG_SPL_TEXT_BASE 0x402F0400 > +#define CONFIG_SPL_TEXT_BASE CONFIG_ISW_ENTRY_ADDR > #define CONFIG_SPL_MAX_SIZE (0x4030B800 - CONFIG_SPL_TEXT_BASE) > #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ > (128 << 20)) >
On Tue, Aug 30, 2016 at 02:06:26PM -0500, Andrew F. Davis wrote: > The SPL load address changes based on boot time in HS devices, > ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs > for similar reasons. Add this same logic for AM33xx devices. > > Also make the default value for ISW_ENTRY_ADDR correct for GP > devices based on SoC, HS devices already pick the correct > value in their defconfig. > > Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
diff --git a/arch/arm/cpu/armv7/am33xx/Kconfig b/arch/arm/cpu/armv7/am33xx/Kconfig index e57e6fb..79c05dd 100644 --- a/arch/arm/cpu/armv7/am33xx/Kconfig +++ b/arch/arm/cpu/armv7/am33xx/Kconfig @@ -108,7 +108,8 @@ config ISW_ENTRY_ADDR point address depending on the device type (secure/non-secure), boot media (xip/non-xip) and image headers. - default 0x402F4000 + default 0x402F4000 if AM43XX + default 0x402F0400 if AM33XX config PUB_ROM_DATA_SIZE hex "Size in bytes of the L3 SRAM reserved by ROM to store data" diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index 349d410..dba40fc 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -56,7 +56,7 @@ * supports X-MODEM loading via UART, and we leverage this and then use * Y-MODEM to load u-boot.img, when booted over UART. */ -#define CONFIG_SPL_TEXT_BASE 0x402F0400 +#define CONFIG_SPL_TEXT_BASE CONFIG_ISW_ENTRY_ADDR #define CONFIG_SPL_MAX_SIZE (0x4030B800 - CONFIG_SPL_TEXT_BASE) #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20))
The SPL load address changes based on boot time in HS devices, ISW_ENTRY_ADDR is used to set this address for AM43xx based SoCs for similar reasons. Add this same logic for AM33xx devices. Also make the default value for ISW_ENTRY_ADDR correct for GP devices based on SoC, HS devices already pick the correct value in their defconfig. Signed-off-by: Andrew F. Davis <afd@ti.com> --- arch/arm/cpu/armv7/am33xx/Kconfig | 3 ++- include/configs/ti_am335x_common.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)