arm: mach-k3: j721s2: Move board selection to mach-k3

Currently each set of board targets from a vendor is selected inside
the board directory for that vendor. This has the problem of multiple
targets, one from each vendor, being selectable at the same time.
For instance you can select both TARGET_AM654_A53_EVM and
TARGET_IOT2050_A53 in the same build.

To fix this we need to move the target board choice to a common location
for each parent SoC selection. Do this in arch/arm/mach-k3.

Signed-off-by: Andrew Davis <afd@ti.com>

diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig
index cd7dc5140acdf06f072a7ecaa477ad3842d88aa5..06722faf8b6998fead9c918174495f5a36da1121 100644 (file)
--- a/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@ -192,6 +192,6 @@ source "arch/arm/mach-k3/am64x/Kconfig"
 source "arch/arm/mach-k3/am62x/Kconfig"
 source "arch/arm/mach-k3/am62ax/Kconfig"
 source "arch/arm/mach-k3/j721e/Kconfig"
-source "board/ti/j721s2/Kconfig"
+source "arch/arm/mach-k3/j721s2/Kconfig"
 
 endif

diff --git a/arch/arm/mach-k3/j721s2/Kconfig b/arch/arm/mach-k3/j721s2/Kconfig
new file mode 100644 (file)
index 0000000..8b54c04
--- /dev/null
+++ b/arch/arm/mach-k3/j721s2/Kconfig
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/
+#      Andrew Davis <afd@ti.com>
+
+if SOC_K3_J721S2
+
+choice
+       prompt "K3 J721S2 based boards"
+       optional
+
+config TARGET_J721S2_A72_EVM
+       bool "TI K3 based J721S2 EVM running on A72"
+       select ARM64
+       select BOARD_LATE_INIT
+       imply TI_I2C_BOARD_DETECT
+       select SYS_DISABLE_DCACHE_OPS
+       select BINMAN
+
+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
+       select BINMAN
+       imply SYS_K3_SPL_ATF
+       imply TI_I2C_BOARD_DETECT
+
+endchoice
+
+source "board/ti/j721s2/Kconfig"
+
+endif

diff --git a/board/ti/j721s2/Kconfig b/board/ti/j721s2/Kconfig
index a4a5d16ba21f9dbb52678914baca3950d8f72c1b..40853a8fd667c6358152cbf3727de00c1279ce69 100644 (file)
--- a/board/ti/j721s2/Kconfig
+++ b/board/ti/j721s2/Kconfig
@@ -3,33 +3,6 @@
 # Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
 #      David Huang <d-huang@ti.com>
 
-choice
-       prompt "K3 J721S2 board"
-       depends on SOC_K3_J721S2
-       optional
-
-config TARGET_J721S2_A72_EVM
-       bool "TI K3 based J721S2 EVM running on A72"
-       select ARM64
-       select BOARD_LATE_INIT
-       imply TI_I2C_BOARD_DETECT
-       select SYS_DISABLE_DCACHE_OPS
-       select BINMAN
-
-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
-       select BINMAN
-       imply SYS_K3_SPL_ATF
-       imply TI_I2C_BOARD_DETECT
-
-endchoice
-
 if TARGET_J721S2_A72_EVM
 
 config SYS_BOARD