From 5bc0a260d13cf1bf88008c3fe7652c76378b8190 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 1 Feb 2024 18:24:43 -0600 Subject: [PATCH] arm: mach-k3: Move SYS_K3_SPL_ATF definition into R5 Kconfig Loading ATF is only supported from the R5, move the Kconfig symbol definition to match. Signed-off-by: Andrew Davis Reviewed-by: Igor Opaniuk --- 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 fdde67c2d3..cb83bd2025 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -116,13 +116,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 ae79f8ff6c..317a6c4b67 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.5