From a4650bf65e4b7d3ef04c90ba8031374428e4a682 Mon Sep 17 00:00:00 2001
From: Andrew Davis <afd@ti.com>
Date: Tue, 25 Jul 2023 10:54:16 -0500
Subject: [PATCH] ti: keystone2: Move common Kconfig selections to under
ARCH_KEYSTONE
These select/imply settings are common to the whole architecture not just
these boards, move these settings to the architecture config.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
arch/arm/Kconfig | 5 +++++
arch/arm/mach-keystone/Kconfig | 20 --------------------
2 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6d971362c2..6b072be246 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -785,16 +785,21 @@ config ARCH_IPQ40XX
config ARCH_KEYSTONE
bool "TI Keystone"
+ select CMD_DDR3
select CMD_POWEROFF
select CPU_V7A
select DDR_SPD
+ select SPL_BOARD_INIT if SPL
select SUPPORT_SPL
select SYS_ARCH_TIMER
select SYS_THUMB_BUILD
imply CMD_MTDPARTS
imply CMD_NFS
imply CMD_SAVES
+ imply DM_I2C
imply FIT
+ imply SOC_TI
+ imply TI_KEYSTONE_SERDES
config ARCH_K3
bool "Texas Instruments' K3 Architecture"
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 94e6fe1f22..9bf71a9b45 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -7,40 +7,20 @@ choice
config TARGET_K2HK_EVM
bool "TI Keystone 2 Kepler/Hawking EVM"
select SOC_K2HK
- select SPL_BOARD_INIT if SPL
- select CMD_DDR3
- imply DM_I2C
- imply SOC_TI
- imply TI_KEYSTONE_SERDES
config TARGET_K2E_EVM
bool "TI Keystone 2 Edison EVM"
select SOC_K2E
- select SPL_BOARD_INIT if SPL
- select CMD_DDR3
- imply DM_I2C
- imply SOC_TI
- imply TI_KEYSTONE_SERDES
config TARGET_K2L_EVM
bool "TI Keystone 2 Lamar EVM"
select SOC_K2L
- select SPL_BOARD_INIT if SPL
- select CMD_DDR3
- imply DM_I2C
- imply SOC_TI
- imply TI_KEYSTONE_SERDES
config TARGET_K2G_EVM
bool "TI Keystone 2 Galileo EVM"
select BOARD_LATE_INIT
select SOC_K2G
- select SPL_BOARD_INIT if SPL
select TI_I2C_BOARD_DETECT
- select CMD_DDR3
- imply DM_I2C
- imply SOC_TI
- imply TI_KEYSTONE_SERDES
endchoice
--
2.39.5