diff mbox series

[2/3] arm: mach-k3: Remove incorrect checks for SPL build

Message ID 20231114155950.296644-2-afd@ti.com
State Accepted
Commit cf2a075b8c176631cd693b863a171fb0e22b61b0
Delegated to: Tom Rini
Headers show
Series [1/3] arm: mach-k3: Move R5 specific code into new r5/ directory | expand

Commit Message

Andrew Davis Nov. 14, 2023, 3:59 p.m. UTC 
The kconfig option SPL means this build supports SPL but not that
this build is SPL, nor that this build is the SPL running on R5.
For options that are for R5 SPL use CPU_V7R.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 arch/arm/mach-k3/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig
index 9168bf842dc..4d19cf3e353 100644
--- a/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@ -111,7 +111,7 @@  config K3_EARLY_CONS_IDX
 
 config K3_LOAD_SYSFW
 	bool
-	depends on SPL
+	depends on CPU_V7R
 
 config K3_SYSFW_IMAGE_NAME
 	string "File name of SYSFW firmware and configuration blob"
@@ -158,7 +158,7 @@  config K3_SYSFW_IMAGE_SPI_OFFS
 
 config SYS_K3_SPL_ATF
 	bool "Start Cortex-A from SPL"
-	depends on SPL && CPU_V7R
+	depends on CPU_V7R
 	help
 	  Enabling this will try to start Cortex-A (typically with ATF)
 	  after SPL from R5.
@@ -172,7 +172,7 @@  config K3_ATF_LOAD_ADDR
 
 config K3_DM_FW
 	bool "Separate DM firmware image"
-	depends on SPL && CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625 || SOC_K3_AM62A7) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAIN
+	depends on CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625 || SOC_K3_AM62A7) && !CLK_TI_SCI && !TI_SCI_POWER_DOMAIN
 	default y
 	help
 	  Enabling this will indicate that the system has separate DM