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>

diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 8fd32c2a46dfe8993323f8c07589fbf0e04fa5e6..56c44062c41130744afe469c4695ea072217545b 100644 (file)
--- 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 d841b3f7b622b42545385d1be0de50556fd6faa5..809d015cf93f8b03575d95eab2967c8fd7aa9f2a 100644 (file)
--- 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))