diff options
| author | Andrew F. Davis <afd@ti.com> | 2017-01-06 16:32:12 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-08 08:31:46 -0500 |
| commit | 4d82c4b53e3c911f21383a547477d6f5916c17a7 (patch) | |
| tree | 8c155d64a2824b9bf018d6ee09329a3878f8f391 | |
| parent | 7410f1464e3fc2e35761160176c8ce14c5122bc9 (diff) | |
| download | u-boot-4d82c4b53e3c911f21383a547477d6f5916c17a7.tar.gz | |
am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE
The SPL load address changes based on boot type 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>
| -rw-r--r-- | arch/arm/mach-omap2/am33xx/Kconfig | 3 | ||||
| -rw-r--r-- | include/configs/ti_am335x_common.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig index 8fd32c2a46d..56c44062c41 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig +++ b/arch/arm/mach-omap2/am33xx/Kconfig @@ -119,7 +119,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 d841b3f7b62..809d015cf93 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_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) |