From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 17/17] ti: keystone: Migrate CONFIG_SOC_K2* to Kconfig
Date: Sun, 12 Sep 2021 20:32:33 -0400 [thread overview]
Message-ID: <20210913003233.4125-17-trini@konsulko.com> (raw)
In-Reply-To: <20210913003233.4125-1-trini@konsulko.com>
Move the individual keystone 2 SoC symbols to the mach Kconfig file,
select them as needed.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-keystone/Kconfig | 16 ++++++++++++++++
include/configs/k2e_evm.h | 3 ---
include/configs/k2g_evm.h | 3 ---
include/configs/k2hk_evm.h | 3 ---
include/configs/k2l_evm.h | 3 ---
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index e06eba5aea1f..94e6fe1f2285 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -6,6 +6,7 @@ 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
@@ -14,6 +15,7 @@ config TARGET_K2HK_EVM
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
@@ -22,6 +24,7 @@ config TARGET_K2E_EVM
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
@@ -31,6 +34,7 @@ config TARGET_K2L_EVM
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
@@ -40,6 +44,18 @@ config TARGET_K2G_EVM
endchoice
+config SOC_K2E
+ bool
+
+config SOC_K2G
+ bool
+
+config SOC_K2HK
+ bool
+
+config SOC_K2L
+ bool
+
config SYS_SOC
default "keystone"
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 35439c02581a..9b25c3498223 100644
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -11,9 +11,6 @@
#include <environment/ti/spi.h>
-/* Platform type */
-#define CONFIG_SOC_K2E
-
#ifdef CONFIG_TI_SECURE_DEVICE
#define DEFAULT_SEC_BOOT_ENV \
DEFAULT_FIT_TI_ARGS \
diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 17245ab15861..56dd9c72d949 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -12,9 +12,6 @@
#include <environment/ti/mmc.h>
#include <environment/ti/spi.h>
-/* Platform type */
-#define CONFIG_SOC_K2G
-
/* U-Boot general configuration */
#define ENV_KS2_BOARD_SETTINGS \
DEFAULT_MMC_TI_ARGS \
diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index f5a20ce02b06..cfc34c7da6d7 100644
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -11,9 +11,6 @@
#include <environment/ti/spi.h>
-/* Platform type */
-#define CONFIG_SOC_K2HK
-
#ifdef CONFIG_TI_SECURE_DEVICE
#define DEFAULT_SEC_BOOT_ENV \
DEFAULT_FIT_TI_ARGS \
diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 97512c9903de..65988fff06ed 100644
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -11,9 +11,6 @@
#include <environment/ti/spi.h>
-/* Platform type */
-#define CONFIG_SOC_K2L
-
#ifdef CONFIG_TI_SECURE_DEVICE
#define DEFAULT_SEC_BOOT_ENV \
DEFAULT_FIT_TI_ARGS \
--
2.17.1
next prev parent reply other threads:[~2021-09-13 0:35 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 0:32 [PATCH 01/17] am335x_guardian: Enable SPL_OF_CONTROL Tom Rini
2021-09-13 0:32 ` [PATCH 02/17] am335x_boneblack_vboot: " Tom Rini
2021-09-13 0:32 ` [PATCH 03/17] am335x: Remove legacy non-DM_USB code Tom Rini
2021-09-13 0:32 ` [PATCH 04/17] keystone2: Move CONFIG_AEMIF_CNTRL_BASE out of CONFIG namespace Tom Rini
2021-09-28 23:20 ` Tom Rini
2021-09-13 0:32 ` [PATCH 05/17] usb: phy: ti: Remove non-DM PHY code Tom Rini
2021-09-28 23:20 ` Tom Rini
2021-09-13 0:32 ` [PATCH 06/17] Convert CONFIG_USB_XHCI_OMAP to Kconfig Tom Rini
2021-09-28 23:20 ` Tom Rini
2021-09-13 0:32 ` [PATCH 07/17] compulab: Clean up some unused symbols Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 08/17] ti: keystone: Clean up or migrate some NAND related options Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 09/17] ti: keystone: dma: Migrate to Kconfig Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 10/17] omapl138_lcdk: Stop using CONFIG_MACH_OMAPL138_LCDK Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 11/17] usb: ehci-omap: Drop non-DM_USB legacy code Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 12/17] Convert CONFIG_OMAP_EHCI_PHY1_RESET_GPIO et al to Kconfig Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 13/17] am3517_evm: Remove unused comments/code Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 14/17] omap3_logic: " Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 15/17] omap4_panda: " Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` [PATCH 16/17] ti: keystone: Move away from CONFIG_SOC_KEYSTONE Tom Rini
2021-09-28 23:21 ` Tom Rini
2021-09-13 0:32 ` Tom Rini [this message]
2021-09-28 23:21 ` [PATCH 17/17] ti: keystone: Migrate CONFIG_SOC_K2* to Kconfig Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210913003233.4125-17-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).