From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 06/11] Convert CONFIG_E300 et al to Kconfig
Date: Thu, 24 Mar 2022 17:18:01 -0400 [thread overview]
Message-ID: <20220324211806.1553189-6-trini@konsulko.com> (raw)
In-Reply-To: <20220324211806.1553189-1-trini@konsulko.com>
This converts the following to Kconfig:
CONFIG_E300
CONFIG_E5500
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/powerpc/cpu/mpc83xx/Kconfig | 3 +++
arch/powerpc/cpu/mpc85xx/Kconfig | 6 ++++++
arch/powerpc/include/asm/config_mpc85xx.h | 2 --
include/configs/MPC837XERDB.h | 1 -
include/configs/km/km-mpc8309.h | 1 -
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 52bc8cf750f8..2ebf8fc221d6 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -1,6 +1,9 @@
menu "mpc83xx CPU"
depends on MPC83xx
+config E300
+ def_bool y
+
config SYS_CPU
default "mpc83xx"
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 6c536b3c6b2d..c1b4e94d9191 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -653,6 +653,7 @@ config ARCH_T1024
bool
select BACKSIDE_L2_CACHE
select E500MC
+ select E5500
select FSL_LAW
select SYS_CACHE_SHIFT_6
select SYS_FSL_DDR_VER_50
@@ -677,6 +678,7 @@ config ARCH_T1040
bool
select BACKSIDE_L2_CACHE
select E500MC
+ select E5500
select FSL_LAW
select SYS_CACHE_SHIFT_6
select SYS_FSL_DDR_VER_50
@@ -701,6 +703,7 @@ config ARCH_T1042
bool
select BACKSIDE_L2_CACHE
select E500MC
+ select E5500
select FSL_LAW
select SYS_CACHE_SHIFT_6
select SYS_FSL_DDR_VER_50
@@ -805,6 +808,9 @@ config E500MC
help
Enble PowerPC E500MC core
+config E5500
+ bool
+
config E6500
bool
select BTB
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 7eb45664e69c..47bfcc72444c 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -270,7 +270,6 @@
#endif
#elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042)
-#define CONFIG_E5500
#define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
#define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1
#define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */
@@ -299,7 +298,6 @@
#define CONFIG_SYS_FSL_SFP_VER_3_0
#elif defined(CONFIG_ARCH_T1024)
-#define CONFIG_E5500
#define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
#define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1
#define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 32dac86431e2..41313d8ad81a 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -13,7 +13,6 @@
/*
* High Level Configuration Options
*/
-#define CONFIG_E300 1 /* E300 family */
#define CONFIG_HWCONFIG
diff --git a/include/configs/km/km-mpc8309.h b/include/configs/km/km-mpc8309.h
index ab629be380e6..af35e8e79267 100644
--- a/include/configs/km/km-mpc8309.h
+++ b/include/configs/km/km-mpc8309.h
@@ -1,7 +1,6 @@
/*
* High Level Configuration Options
*/
-#define CONFIG_E300 1 /* E300 family */
#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0"
--
2.25.1
next prev parent reply other threads:[~2022-03-24 21:19 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-24 21:17 [PATCH 01/11] db-mv784mp-gp: Rename CONFIG_DB_784MP_GP to CONFIG_TARGET_DB_MV784MP_GP Tom Rini
2022-03-24 21:17 ` [PATCH 02/11] M5329EVB, M5373EVB: Remove CONFIG_NANDFLASH_SIZE Tom Rini
2022-03-24 21:17 ` [PATCH 03/11] Convert CONFIG_DEEP_SLEEP to Kconfig Tom Rini
2022-03-24 21:17 ` [PATCH 04/11] exynos: Drop CONFIG_DEVICE_TREE_LIST Tom Rini
2022-03-25 0:21 ` Jaehoon Chung
2022-03-25 4:41 ` Minkyu Kang
2022-03-24 21:18 ` [PATCH 05/11] mx53loco: Convert CONFIG_DIALOG_POWER to Kconfig Tom Rini
2022-03-24 21:18 ` Tom Rini [this message]
2022-03-24 21:18 ` [PATCH 07/11] Convert CONFIG_SRIO_PCIE_BOOT_SLAVE " Tom Rini
2022-03-24 21:18 ` [PATCH 08/11] at91: Switch to SD_BOOT / CONFIG_NAND_BOOT Tom Rini
2022-03-24 21:18 ` [PATCH 09/11] Convert CONFIG_NORFLASH_PS32BIT to Kconfig Tom Rini
2022-03-24 21:18 ` [PATCH 10/11] Convert CONFIG_SYS_MONITOR_BASE " Tom Rini
2022-03-24 21:18 ` [PATCH 11/11] global: Remove CONFIG_SYS_EXTRA_OPTIONS support Tom Rini
2022-03-28 6:35 ` [PATCH 01/11] db-mv784mp-gp: Rename CONFIG_DB_784MP_GP to CONFIG_TARGET_DB_MV784MP_GP Stefan Roese
2022-04-01 18:45 ` 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=20220324211806.1553189-6-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