arm: mach-k3: am62x: 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 7293e3cb4fd0375ff3fa72f1c74543c89f420f30..a460952f1199e12d3259212bf2f96c76c537a32a 100644 (file)
--- a/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@ -189,9 +189,9 @@ config K3_X509_SWRV
 
 source "arch/arm/mach-k3/am65x/Kconfig"
 source "arch/arm/mach-k3/am64x/Kconfig"
-source "board/ti/am62x/Kconfig"
+source "arch/arm/mach-k3/am62x/Kconfig"
 source "board/ti/am62ax/Kconfig"
 source "arch/arm/mach-k3/j721e/Kconfig"
 source "board/ti/j721s2/Kconfig"
-source "board/toradex/verdin-am62/Kconfig"
+
 endif

diff --git a/arch/arm/mach-k3/am62x/Kconfig b/arch/arm/mach-k3/am62x/Kconfig
new file mode 100644 (file)
index 0000000..738065e
--- /dev/null
+++ b/arch/arm/mach-k3/am62x/Kconfig
@@ -0,0 +1,49 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/
+#      Andrew Davis <afd@ti.com>
+
+if SOC_K3_AM625
+
+choice
+       prompt "K3 AM62x based boards"
+       optional
+
+config TARGET_AM625_A53_EVM
+       bool "TI K3 based AM625 EVM running on A53"
+       select ARM64
+       select BINMAN
+
+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
+       select BINMAN
+       imply SYS_K3_SPL_ATF
+
+config TARGET_VERDIN_AM62_A53
+       bool "Toradex Verdin AM62 running on A53"
+       select ARM64
+       select BINMAN
+
+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
+       select BINMAN
+       imply SYS_K3_SPL_ATF
+
+endchoice
+
+source "board/ti/am62x/Kconfig"
+source "board/toradex/verdin-am62/Kconfig"
+
+endif

diff --git a/board/ti/am62x/Kconfig b/board/ti/am62x/Kconfig
index b4b70337d18e8a7c2cce128c0c6fc0b4a8eae983..610dacfdc0855b3e0d51eb8f2a3a6e3c2ff445a2 100644 (file)
--- a/board/ti/am62x/Kconfig
+++ b/board/ti/am62x/Kconfig
@@ -3,29 +3,6 @@
 # Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/
 #      Suman Anna <s-anna@ti.com>
 
-choice
-       prompt "TI K3 AM62x based boards"
-       depends on SOC_K3_AM625
-       optional
-
-config TARGET_AM625_A53_EVM
-       bool "TI K3 based AM625 EVM running on A53"
-       select ARM64
-       select BINMAN
-
-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
-       select BINMAN
-       imply SYS_K3_SPL_ATF
-
-endchoice
-
 if TARGET_AM625_A53_EVM
 
 config SYS_BOARD

diff --git a/board/toradex/verdin-am62/Kconfig b/board/toradex/verdin-am62/Kconfig
index abc2984f25038cebc3015b8849178a42223e288d..fd65a96b3dfe85bb8dfa05179f2d51b7f0030545 100644 (file)
--- a/board/toradex/verdin-am62/Kconfig
+++ b/board/toradex/verdin-am62/Kconfig
@@ -3,29 +3,6 @@
 # Copyright 2023 Toradex
 #
 
-choice
-       prompt "Toradex Verdin AM62 based boards"
-       depends on SOC_K3_AM625
-       optional
-
-config TARGET_VERDIN_AM62_A53
-       bool "Toradex Verdin AM62 running on A53"
-       select ARM64
-       select BINMAN
-
-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
-       select BINMAN
-       imply SYS_K3_SPL_ATF
-
-endchoice
-
 if TARGET_VERDIN_AM62_A53
 
 config SYS_BOARD