| Message ID | 20240214163009.983034-2-afd@ti.com |
|---|---|
| State | Accepted |
| Commit | 4129bdfbc1f4ce167747662db1d3b4f3f2fba2ff |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Move DRAM address of ATF | expand |
Hi Andrew On 14/02/24 22:00, Andrew Davis wrote: > There is a default ATF load address that is used for devices that have > ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead > of having to override the address in every defconfig, make add a > default for these ATF in DRAM devices. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > arch/arm/mach-k3/Kconfig | 5 +++-- > configs/am62ax_evm_a53_defconfig | 1 - > configs/am62x_beagleplay_a53_defconfig | 1 - > configs/am62x_evm_a53_defconfig | 1 - > configs/phycore_am62x_a53_defconfig | 1 - > configs/verdin-am62_a53_defconfig | 1 - > 6 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig > index 03898424c95..0bd3f9fa12d 100644 > --- a/arch/arm/mach-k3/Kconfig > +++ b/arch/arm/mach-k3/Kconfig > @@ -123,10 +123,11 @@ config SYS_K3_SPL_ATF > > config K3_ATF_LOAD_ADDR > hex "Load address of ATF image" > + default 0x9e780000 if (SOC_K3_AM625 || SOC_K3_AM62A7) > default 0x70000000 > help > - The load address for the ATF image. This value defaults to 0x70000000 > - if not provided in the board defconfig file. > + The load address for the ATF image. This value is used to build the > + FIT image header that places ATF in memory where it will run. > > config K3_DM_FW > bool "Separate DM firmware image" > diff --git a/configs/am62ax_evm_a53_defconfig b/configs/am62ax_evm_a53_defconfig > index 38083586a3e..03b2dea7d51 100644 > --- a/configs/am62ax_evm_a53_defconfig > +++ b/configs/am62ax_evm_a53_defconfig > @@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=2 > CONFIG_SOC_K3_AM62A7=y > -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 > CONFIG_TARGET_AM62A7_A53_EVM=y > CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000 > diff --git a/configs/am62x_beagleplay_a53_defconfig b/configs/am62x_beagleplay_a53_defconfig > index 0be20045a97..122c1ba9299 100644 > --- a/configs/am62x_beagleplay_a53_defconfig > +++ b/configs/am62x_beagleplay_a53_defconfig > @@ -6,7 +6,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=2 > CONFIG_SOC_K3_AM625=y > -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 > CONFIG_TARGET_AM625_A53_BEAGLEPLAY=y > CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000 > diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig > index 457931faf21..e29df6ec523 100644 > --- a/configs/am62x_evm_a53_defconfig > +++ b/configs/am62x_evm_a53_defconfig > @@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=2 > CONFIG_SOC_K3_AM625=y > -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 > CONFIG_TARGET_AM625_A53_EVM=y > CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000 > diff --git a/configs/phycore_am62x_a53_defconfig b/configs/phycore_am62x_a53_defconfig > index 2d5d906a9d7..5ba08440268 100644 > --- a/configs/phycore_am62x_a53_defconfig > +++ b/configs/phycore_am62x_a53_defconfig > @@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=2 > CONFIG_SOC_K3_AM625=y > -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 > CONFIG_TARGET_PHYCORE_AM62X_A53=y > CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000 > diff --git a/configs/verdin-am62_a53_defconfig b/configs/verdin-am62_a53_defconfig > index 956e3a1ad75..2003a530c7d 100644 > --- a/configs/verdin-am62_a53_defconfig > +++ b/configs/verdin-am62_a53_defconfig > @@ -8,7 +8,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_NR_DRAM_BANKS=2 > CONFIG_SOC_K3_AM625=y > -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 > CONFIG_TARGET_VERDIN_AM62_A53=y > CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000 Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
On February 14, 2024 thus sayeth Andrew Davis: > There is a default ATF load address that is used for devices that have > ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead > of having to override the address in every defconfig, make add a > default for these ATF in DRAM devices. > > Signed-off-by: Andrew Davis <afd@ti.com> Acked-by: Bryan Brattlof <bb@ti.com> > --- > arch/arm/mach-k3/Kconfig | 5 +++-- > configs/am62ax_evm_a53_defconfig | 1 - > configs/am62x_beagleplay_a53_defconfig | 1 - > configs/am62x_evm_a53_defconfig | 1 - > configs/phycore_am62x_a53_defconfig | 1 - > configs/verdin-am62_a53_defconfig | 1 - > 6 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig > index 03898424c95..0bd3f9fa12d 100644 > --- a/arch/arm/mach-k3/Kconfig > +++ b/arch/arm/mach-k3/Kconfig > @@ -123,10 +123,11 @@ config SYS_K3_SPL_ATF > > config K3_ATF_LOAD_ADDR > hex "Load address of ATF image" > + default 0x9e780000 if (SOC_K3_AM625 || SOC_K3_AM62A7) I went ahead an added this to the TODO for 62p's respin ~Bryan
diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 03898424c95..0bd3f9fa12d 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -123,10 +123,11 @@ config SYS_K3_SPL_ATF config K3_ATF_LOAD_ADDR hex "Load address of ATF image" + default 0x9e780000 if (SOC_K3_AM625 || SOC_K3_AM62A7) default 0x70000000 help - The load address for the ATF image. This value defaults to 0x70000000 - if not provided in the board defconfig file. + The load address for the ATF image. This value is used to build the + FIT image header that places ATF in memory where it will run. config K3_DM_FW bool "Separate DM firmware image" diff --git a/configs/am62ax_evm_a53_defconfig b/configs/am62ax_evm_a53_defconfig index 38083586a3e..03b2dea7d51 100644 --- a/configs/am62ax_evm_a53_defconfig +++ b/configs/am62ax_evm_a53_defconfig @@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM62A7=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_AM62A7_A53_EVM=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80480000 diff --git a/configs/am62x_beagleplay_a53_defconfig b/configs/am62x_beagleplay_a53_defconfig index 0be20045a97..122c1ba9299 100644 --- a/configs/am62x_beagleplay_a53_defconfig +++ b/configs/am62x_beagleplay_a53_defconfig @@ -6,7 +6,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_AM625_A53_BEAGLEPLAY=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000 diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig index 457931faf21..e29df6ec523 100644 --- a/configs/am62x_evm_a53_defconfig +++ b/configs/am62x_evm_a53_defconfig @@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_AM625_A53_EVM=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000 diff --git a/configs/phycore_am62x_a53_defconfig b/configs/phycore_am62x_a53_defconfig index 2d5d906a9d7..5ba08440268 100644 --- a/configs/phycore_am62x_a53_defconfig +++ b/configs/phycore_am62x_a53_defconfig @@ -5,7 +5,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_PHYCORE_AM62X_A53=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000 diff --git a/configs/verdin-am62_a53_defconfig b/configs/verdin-am62_a53_defconfig index 956e3a1ad75..2003a530c7d 100644 --- a/configs/verdin-am62_a53_defconfig +++ b/configs/verdin-am62_a53_defconfig @@ -8,7 +8,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 CONFIG_SOC_K3_AM625=y -CONFIG_K3_ATF_LOAD_ADDR=0x9e780000 CONFIG_TARGET_VERDIN_AM62_A53=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000
There is a default ATF load address that is used for devices that have ATF running in SRAM. For AM62 and AM62a, ATF runs from DRAM. Instead of having to override the address in every defconfig, make add a default for these ATF in DRAM devices. Signed-off-by: Andrew Davis <afd@ti.com> --- arch/arm/mach-k3/Kconfig | 5 +++-- configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 1 - 6 files changed, 3 insertions(+), 7 deletions(-)