Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4d82c4b53e3c911f21383a547477d6f5916c17a7

Authored by Andrew F. Davis
Committed by Tom Rini
1 parent 7410f1464e
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

arch/arm/mach-omap2/am33xx/Kconfig
Diff comments   View file @ 4d82c4b
... ... @@ -119,7 +119,8 @@
119 119 point address depending on the device type
120 120 (secure/non-secure), boot media (xip/non-xip) and
121 121 image headers.
122   - default 0x402F4000
  122 + default 0x402F4000 if AM43XX
  123 + default 0x402F0400 if AM33XX
123 124  
124 125 config PUB_ROM_DATA_SIZE
125 126 hex "Size in bytes of the L3 SRAM reserved by ROM to store data"
include/configs/ti_am335x_common.h
Diff comments   View file @ 4d82c4b
... ... @@ -56,7 +56,7 @@
56 56 * supports X-MODEM loading via UART, and we leverage this and then use
57 57 * Y-MODEM to load u-boot.img, when booted over UART.
58 58 */
59   -#define CONFIG_SPL_TEXT_BASE 0x402F0400
  59 +#define CONFIG_SPL_TEXT_BASE CONFIG_ISW_ENTRY_ADDR
60 60 #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \
61 61 (128 << 20))
62 62