These two symbols are always selected by default for R5 builds. These
symbols already depend on R5 builds, so make it default at their
definition to remove select/imply at each board target site.
Signed-off-by: Andrew Davis <a...@ti.com>
---
arch/arm/mach-k3/am62ax/Kconfig | 4 ----
arch/arm/mach-k3/am62px/Kconfig | 2 --
arch/arm/mach-k3/am62x/Kconfig | 6 ------
arch/arm/mach-k3/am64x/Kconfig | 4 ----
arch/arm/mach-k3/am65x/Kconfig | 2 --
arch/arm/mach-k3/j721e/Kconfig | 4 ----
arch/arm/mach-k3/j721s2/Kconfig | 2 --
arch/arm/mach-k3/j722s/Kconfig | 2 --
arch/arm/mach-k3/j784s4/Kconfig | 2 --
arch/arm/mach-k3/r5/Kconfig | 2 ++
board/beagle/beagleboneai64/Kconfig | 2 --
board/beagle/beagleplay/Kconfig | 2 --
12 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/arch/arm/mach-k3/am62ax/Kconfig b/arch/arm/mach-k3/am62ax/Kconfig
index 151fc6b592e..708c564f8bb 100644
--- a/arch/arm/mach-k3/am62ax/Kconfig
+++ b/arch/arm/mach-k3/am62ax/Kconfig
@@ -19,11 +19,9 @@ config TARGET_AM62A7_R5_EVM
bool "TI K3 based AM62A7 EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
imply TI_I2C_BOARD_DETECT
config TARGET_PHYCORE_AM62AX_A53
@@ -38,11 +36,9 @@ config TARGET_PHYCORE_AM62AX_R5
bool "PHYTEC phyCORE-AM62Ax running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
endchoice
diff --git a/arch/arm/mach-k3/am62px/Kconfig b/arch/arm/mach-k3/am62px/Kconfig
index cd23740d7bc..c043f961723 100644
--- a/arch/arm/mach-k3/am62px/Kconfig
+++ b/arch/arm/mach-k3/am62px/Kconfig
@@ -18,11 +18,9 @@ config TARGET_AM62P5_R5_EVM
bool "TI K3 based AM62P5 EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
endchoice
diff --git a/arch/arm/mach-k3/am62x/Kconfig b/arch/arm/mach-k3/am62x/Kconfig
index 0f16cfa8b92..dab83990824 100644
--- a/arch/arm/mach-k3/am62x/Kconfig
+++ b/arch/arm/mach-k3/am62x/Kconfig
@@ -18,11 +18,9 @@ config TARGET_AM625_R5_EVM
bool "TI K3 based AM625 EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
config TARGET_PHYCORE_AM62X_A53
bool "PHYTEC phyCORE-AM62x running on A53"
@@ -34,12 +32,10 @@ config TARGET_PHYCORE_AM62X_R5
bool "PHYTEC phyCORE-AM62x running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
select PHYTEC_K3_DDR_PATCH
- imply SYS_K3_SPL_ATF
config TARGET_VERDIN_AM62_A53
bool "Toradex Verdin AM62 running on A53"
@@ -51,11 +47,9 @@ config TARGET_VERDIN_AM62_R5
bool "Toradex Verdin AM62 running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
endchoice
diff --git a/arch/arm/mach-k3/am64x/Kconfig b/arch/arm/mach-k3/am64x/Kconfig
index 4a1cae3d0f2..06f57a35349 100644
--- a/arch/arm/mach-k3/am64x/Kconfig
+++ b/arch/arm/mach-k3/am64x/Kconfig
@@ -18,11 +18,9 @@ config TARGET_AM642_R5_EVM
bool "TI K3 based AM642 EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
imply TI_I2C_BOARD_DETECT
config TARGET_PHYCORE_AM64X_A53
@@ -36,11 +34,9 @@ config TARGET_PHYCORE_AM64X_R5
bool "PHYTEC phyCORE-AM64x running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
endchoice
diff --git a/arch/arm/mach-k3/am65x/Kconfig b/arch/arm/mach-k3/am65x/Kconfig
index e823549b535..58b7d15e980 100644
--- a/arch/arm/mach-k3/am65x/Kconfig
+++ b/arch/arm/mach-k3/am65x/Kconfig
@@ -21,9 +21,7 @@ config TARGET_AM654_R5_EVM
bool "TI K3 based AM654 EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select K3_AM654_DDRSS
- imply SYS_K3_SPL_ATF
imply TI_I2C_BOARD_DETECT
config TARGET_IOT2050_A53
diff --git a/arch/arm/mach-k3/j721e/Kconfig b/arch/arm/mach-k3/j721e/Kconfig
index 32d5bbfda66..b5785bdff98 100644
--- a/arch/arm/mach-k3/j721e/Kconfig
+++ b/arch/arm/mach-k3/j721e/Kconfig
@@ -20,11 +20,9 @@ config TARGET_J721E_R5_EVM
bool "TI K3 based J721E EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
imply TI_I2C_BOARD_DETECT
config TARGET_J7200_A72_EVM
@@ -39,11 +37,9 @@ config TARGET_J7200_R5_EVM
bool "TI K3 based J7200 EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
imply TI_I2C_BOARD_DETECT
endchoice
diff --git a/arch/arm/mach-k3/j721s2/Kconfig b/arch/arm/mach-k3/j721s2/Kconfig
index 4872166fefd..fc3ef7f617a 100644
--- a/arch/arm/mach-k3/j721s2/Kconfig
+++ b/arch/arm/mach-k3/j721s2/Kconfig
@@ -20,11 +20,9 @@ config TARGET_J721S2_R5_EVM
bool "TI K3 based J721S2 EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
imply TI_I2C_BOARD_DETECT
endchoice
diff --git a/arch/arm/mach-k3/j722s/Kconfig b/arch/arm/mach-k3/j722s/Kconfig
index ce63168187e..59f7403677c 100644
--- a/arch/arm/mach-k3/j722s/Kconfig
+++ b/arch/arm/mach-k3/j722s/Kconfig
@@ -18,11 +18,9 @@ config TARGET_J722S_R5_EVM
bool "TI K3 based J722S EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
endchoice
diff --git a/arch/arm/mach-k3/j784s4/Kconfig b/arch/arm/mach-k3/j784s4/Kconfig
index c6a3689ce08..f5973fe06b5 100644
--- a/arch/arm/mach-k3/j784s4/Kconfig
+++ b/arch/arm/mach-k3/j784s4/Kconfig
@@ -19,11 +19,9 @@ config TARGET_J784S4_R5_EVM
bool "TI K3 based J784S4 EVM running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
endchoice
diff --git a/arch/arm/mach-k3/r5/Kconfig b/arch/arm/mach-k3/r5/Kconfig
index 12335880e10..45acceefeae 100644
--- a/arch/arm/mach-k3/r5/Kconfig
+++ b/arch/arm/mach-k3/r5/Kconfig
@@ -1,4 +1,5 @@
config K3_LOAD_SYSFW
+ default y
bool
config K3_OPP_LOW
@@ -61,6 +62,7 @@ config K3_SYSFW_IMAGE_SPI_OFFS
config SYS_K3_SPL_ATF
bool "Start Cortex-A from SPL"
+ default y
help
Enabling this will try to start Cortex-A (typically with ATF)
after SPL from R5.
diff --git a/board/beagle/beagleboneai64/Kconfig
b/board/beagle/beagleboneai64/Kconfig
index 41f3f02f5c3..f9a20ed9372 100644
--- a/board/beagle/beagleboneai64/Kconfig
+++ b/board/beagle/beagleboneai64/Kconfig
@@ -18,11 +18,9 @@ config TARGET_J721E_R5_BEAGLEBONEAI64
bool "BeagleBoard.org J721E BeagleBone AI-64 running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
endchoice
diff --git a/board/beagle/beagleplay/Kconfig b/board/beagle/beagleplay/Kconfig
index d691a0c5e02..538b5abf480 100644
--- a/board/beagle/beagleplay/Kconfig
+++ b/board/beagle/beagleplay/Kconfig
@@ -17,11 +17,9 @@ config TARGET_AM625_R5_BEAGLEPLAY
bool "BeagleBoard.org AM625 BeaglePlay running on R5"
select CPU_V7R
select SYS_THUMB_BUILD
- select K3_LOAD_SYSFW
select RAM
select SPL_RAM
select K3_DDRSS
- imply SYS_K3_SPL_ATF
endchoice
--
2.39.2
