| Message ID | 20240202002448.1116407-1-afd@ti.com |
|---|---|
| State | Accepted |
| Commit | 5bc0a260d13cf1bf88008c3fe7652c76378b8190 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/6] arm: mach-k3: Move SYS_K3_SPL_ATF definition into R5 Kconfig | expand |
Hi Andrew, On Fri, Feb 2, 2024 at 1:25 AM Andrew Davis <afd@ti.com> wrote: > > Loading ATF is only supported from the R5, move the Kconfig symbol > definition to match. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > arch/arm/mach-k3/Kconfig | 7 ------- > arch/arm/mach-k3/r5/Kconfig | 6 ++++++ > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig > index 03898424c95..45cf740bb1f 100644 > --- a/arch/arm/mach-k3/Kconfig > +++ b/arch/arm/mach-k3/Kconfig > @@ -114,13 +114,6 @@ config K3_EARLY_CONS_IDX > Use this option to set the index of the serial device to be used > for the early console during SPL execution. > > -config SYS_K3_SPL_ATF > - bool "Start Cortex-A from SPL" > - depends on CPU_V7R > - help > - Enabling this will try to start Cortex-A (typically with ATF) > - after SPL from R5. > - > config K3_ATF_LOAD_ADDR > hex "Load address of ATF image" > default 0x70000000 > diff --git a/arch/arm/mach-k3/r5/Kconfig b/arch/arm/mach-k3/r5/Kconfig > index ae79f8ff6cd..317a6c4b67e 100644 > --- a/arch/arm/mach-k3/r5/Kconfig > +++ b/arch/arm/mach-k3/r5/Kconfig > @@ -43,3 +43,9 @@ config K3_SYSFW_IMAGE_SPI_OFFS > help > Offset of the combined System Firmware and configuration image tree > blob to be loaded when booting from a SPI flash memory. > + > +config SYS_K3_SPL_ATF > + bool "Start Cortex-A from SPL" > + help > + Enabling this will try to start Cortex-A (typically with ATF) > + after SPL from R5. > -- > 2.39.2 > Reviewed-by: Igor Opaniuk <igor.opaniuk@foundries.io>
On Thu, Feb 01, 2024 at 06:24:43PM -0600, Andrew Davis wrote: > Loading ATF is only supported from the R5, move the Kconfig symbol > definition to match. > > Signed-off-by: Andrew Davis <afd@ti.com> > Reviewed-by: Igor Opaniuk <igor.opaniuk@foundries.io> For the series, applied to u-boot/next, thanks!
diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 03898424c95..45cf740bb1f 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -114,13 +114,6 @@ config K3_EARLY_CONS_IDX Use this option to set the index of the serial device to be used for the early console during SPL execution. -config SYS_K3_SPL_ATF - bool "Start Cortex-A from SPL" - depends on CPU_V7R - help - Enabling this will try to start Cortex-A (typically with ATF) - after SPL from R5. - config K3_ATF_LOAD_ADDR hex "Load address of ATF image" default 0x70000000 diff --git a/arch/arm/mach-k3/r5/Kconfig b/arch/arm/mach-k3/r5/Kconfig index ae79f8ff6cd..317a6c4b67e 100644 --- a/arch/arm/mach-k3/r5/Kconfig +++ b/arch/arm/mach-k3/r5/Kconfig @@ -43,3 +43,9 @@ config K3_SYSFW_IMAGE_SPI_OFFS help Offset of the combined System Firmware and configuration image tree blob to be loaded when booting from a SPI flash memory. + +config SYS_K3_SPL_ATF + bool "Start Cortex-A from SPL" + help + Enabling this will try to start Cortex-A (typically with ATF) + after SPL from R5.
Loading ATF is only supported from the R5, move the Kconfig symbol definition to match. Signed-off-by: Andrew Davis <afd@ti.com> --- arch/arm/mach-k3/Kconfig | 7 ------- arch/arm/mach-k3/r5/Kconfig | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-)