[PATCH 4/7] arm: mach-k3: am64x: Move board selection to mach-k3

[Andrew Davis]

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 at ti.com>
---
 arch/arm/mach-k3/Kconfig                     |  2 +-
 {board/ti => arch/arm/mach-k3}/am64x/Kconfig | 34 +++-----------------
 board/ti/am64x/Kconfig                       | 27 ----------------
 3 files changed, 6 insertions(+), 57 deletions(-)
 copy {board/ti => arch/arm/mach-k3}/am64x/Kconfig (51%)

diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig
index 01889e9d7cf..7293e3cb4fd 100644
--- a/arch/arm/mach-k3/Kconfig
+++ b/arch/arm/mach-k3/Kconfig
@@ -188,7 +188,7 @@ config K3_X509_SWRV
 	  SWRV for X509 certificate used for boot images
 
 source "arch/arm/mach-k3/am65x/Kconfig"
-source "board/ti/am64x/Kconfig"
+source "arch/arm/mach-k3/am64x/Kconfig"
 source "board/ti/am62x/Kconfig"
 source "board/ti/am62ax/Kconfig"
 source "arch/arm/mach-k3/j721e/Kconfig"
diff --git a/board/ti/am64x/Kconfig b/arch/arm/mach-k3/am64x/Kconfig
similarity index 51%
copy from board/ti/am64x/Kconfig
copy to arch/arm/mach-k3/am64x/Kconfig
index 2dbc6197b75..6f7b0039615 100644
--- a/board/ti/am64x/Kconfig
+++ b/arch/arm/mach-k3/am64x/Kconfig
@@ -1,10 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
-# Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/
+# Copyright (C) 2023 Texas Instruments Incorporated - https://www.ti.com/
+#	Andrew Davis <afd at ti.com>
+
+if SOC_K3_AM642
 
 choice
 	prompt "K3 AM64 based boards"
-	depends on SOC_K3_AM642
 	optional
 
 config TARGET_AM642_A53_EVM
@@ -29,32 +31,6 @@ config TARGET_AM642_R5_EVM
 
 endchoice
 
-if TARGET_AM642_A53_EVM
-
-config SYS_BOARD
-       default "am64x"
-
-config SYS_VENDOR
-       default "ti"
-
-config SYS_CONFIG_NAME
-       default "am64x_evm"
-
-source "board/ti/common/Kconfig"
-
-endif
-
-if TARGET_AM642_R5_EVM
-
-config SYS_BOARD
-       default "am64x"
-
-config SYS_VENDOR
-       default "ti"
-
-config SYS_CONFIG_NAME
-       default "am64x_evm"
-
-source "board/ti/common/Kconfig"
+source "board/ti/am64x/Kconfig"
 
 endif
diff --git a/board/ti/am64x/Kconfig b/board/ti/am64x/Kconfig
index 2dbc6197b75..b873476a9d5 100644
--- a/board/ti/am64x/Kconfig
+++ b/board/ti/am64x/Kconfig
@@ -2,33 +2,6 @@
 #
 # Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/
 
-choice
-	prompt "K3 AM64 based boards"
-	depends on SOC_K3_AM642
-	optional
-
-config TARGET_AM642_A53_EVM
-	bool "TI K3 based AM642 EVM running on A53"
-	select ARM64
-	select BINMAN
-	imply BOARD
-	imply SPL_BOARD
-	imply TI_I2C_BOARD_DETECT
-
-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
-	select BINMAN
-	imply SYS_K3_SPL_ATF
-	imply TI_I2C_BOARD_DETECT
-
-endchoice
-
 if TARGET_AM642_A53_EVM
 
 config SYS_BOARD
-- 
2.39.2