diff mbox

[U-Boot,v3,08/11] am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE

Message ID 26739b1f-3e5e-adf7-c4eb-0e59241be376@ti.com
State Not Applicable
Delegated to: Tom Rini
Headers show

Commit Message

Lokesh Vutla Aug. 26, 2016, 5:01 a.m. UTC
On Friday 26 August 2016 03:15 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.
> 
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
>  include/configs/ti_am335x_common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
> index a0a60d4..52f4ed6 100644
> --- a/include/configs/ti_am335x_common.h
> +++ b/include/configs/ti_am335x_common.h
> @@ -57,7 +57,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

Please include the below change as well or else am33xx gp boot might
break as fefault address is different.



Thanks and regards,
Lokesh

>  #define CONFIG_SPL_MAX_SIZE		(0x4030B800 - CONFIG_SPL_TEXT_BASE)
>  #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \
>  					 (128 << 20))
>

Comments

Andrew Davis Aug. 30, 2016, 6:20 p.m. UTC | #1
On 08/26/2016 12:01 AM, Lokesh Vutla wrote:
> 
> 
> On Friday 26 August 2016 03:15 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.
>>
>> Signed-off-by: Andrew F. Davis <afd@ti.com>
>> ---
>>  include/configs/ti_am335x_common.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
>> index a0a60d4..52f4ed6 100644
>> --- a/include/configs/ti_am335x_common.h
>> +++ b/include/configs/ti_am335x_common.h
>> @@ -57,7 +57,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
> 
> Please include the below change as well or else am33xx gp boot might
> break as fefault address is different.
> 
> diff --git a/arch/arm/cpu/armv7/am33xx/Kconfig
> b/arch/arm/cpu/armv7/am33xx/Kconfig
> index dc51e9b..3a48664 100644
> --- a/arch/arm/cpu/armv7/am33xx/Kconfig
> +++ b/arch/arm/cpu/armv7/am33xx/Kconfig
> @@ -22,7 +22,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
> 

Good eye, for some reason I mistook them for the same value, will fix.

>  config PUB_ROM_DATA_SIZE
>  	hex "Size in bytes of the L3 SRAM reserved by ROM to store data"
> 
> 
> Thanks and regards,
> Lokesh
> 
>>  #define CONFIG_SPL_MAX_SIZE		(0x4030B800 - CONFIG_SPL_TEXT_BASE)
>>  #define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \
>>  					 (128 << 20))
>>
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/am33xx/Kconfig
b/arch/arm/cpu/armv7/am33xx/Kconfig
index dc51e9b..3a48664 100644
--- a/arch/arm/cpu/armv7/am33xx/Kconfig
+++ b/arch/arm/cpu/armv7/am33xx/Kconfig
@@ -22,7 +22,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"