diff options
| author | Andrew Davis <afd@ti.com> | 2023-11-01 15:35:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-22 09:37:23 -0500 |
| commit | ed51c911a6454a9b6e2e460fc3197a4128b7f3c7 (patch) | |
| tree | b7546af79ba5468dab8285220608bcb91d8c1edf | |
| parent | c3a9f9b2b9bc0dd9345a5f82ef753a70c6f77dc3 (diff) | |
| download | u-boot-ed51c911a6454a9b6e2e460fc3197a4128b7f3c7.zip u-boot-ed51c911a6454a9b6e2e460fc3197a4128b7f3c7.tar.gz u-boot-ed51c911a6454a9b6e2e460fc3197a4128b7f3c7.tar.bz2 | |
arm: mach-k3: am64x: 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>
| -rw-r--r-- | arch/arm/mach-k3/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-k3/am64x/Kconfig | 36 | ||||
| -rw-r--r-- | board/ti/am64x/Kconfig | 27 |
3 files changed, 37 insertions, 28 deletions
diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 01889e9..7293e3c 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/arch/arm/mach-k3/am64x/Kconfig b/arch/arm/mach-k3/am64x/Kconfig new file mode 100644 index 0000000..6f7b003 --- /dev/null +++ b/arch/arm/mach-k3/am64x/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_AM642 + +choice + prompt "K3 AM64 based boards" + 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 + +source "board/ti/am64x/Kconfig" + +endif diff --git a/board/ti/am64x/Kconfig b/board/ti/am64x/Kconfig index 2dbc619..b873476 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 |