From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 17/17] Convert CONFIG_KIRKWOOD_PCIE_INIT et al to Kconfig
Date: Mon, 20 Jun 2022 08:07:58 -0400 [thread overview]
Message-ID: <20220620120758.765049-17-trini@konsulko.com> (raw)
In-Reply-To: <20220620120758.765049-1-trini@konsulko.com>
This converts the following to Kconfig:
CONFIG_KIRKWOOD_EGIGA_INIT
CONFIG_KIRKWOOD_PCIE_INIT
CONFIG_KIRKWOOD_RGMII_PAD_1V8
CONFIG_KM_DISABLE_PCIE
Signed-off-by: Tom Rini <trini@konsulko.com>
---
arch/arm/mach-kirkwood/Kconfig | 12 ++++++++++++
arch/arm/mach-kirkwood/include/mach/config.h | 3 ---
configs/km_kirkwood_128m16_defconfig | 1 +
configs/km_kirkwood_defconfig | 1 +
configs/kmcoge5un_defconfig | 1 +
include/configs/SBx81LIFKW.h | 4 ----
include/configs/SBx81LIFXCAT.h | 4 ----
include/configs/km_kirkwood.h | 7 -------
8 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index ca2da003b65b..98bb10c2dee3 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -121,6 +121,18 @@ endchoice
config SYS_SOC
default "kirkwood"
+config KIRKWOOD_RGMII_PAD_1V8
+ bool "Configures the I/O voltage of the pads connected gigabit interface to 1.8V"
+ default y
+
+config KIRKWOOD_EGIGA_INIT
+ bool "Enable GbePort0/1 for kernel"
+ default y
+
+config KIRKWOOD_PCIE_INIT
+ bool "Enable PCIe Port0 for kernel"
+ default y
+
source "board/Marvell/openrd/Kconfig"
source "board/Marvell/dreamplug/Kconfig"
source "board/Synology/ds109/Kconfig"
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index ca341570544b..90e86ab99b41 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -23,9 +23,6 @@
#endif /* CONFIG_KW88F6281 */
#include <asm/arch/soc.h>
-#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */
-#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
-#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 for kernel */
#define CONFIG_I2C_MVTWSI_BASE0 KW_TWSI_BASE
#define MV_UART_CONSOLE_BASE KW_UART0_BASE
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index 1d8ae5876b90..655759b09ce7 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage_128M16_1.cfg"
CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_SYS_MALLOC_F_LEN=0x400
CONFIG_TARGET_KM_KIRKWOOD=y
+# CONFIG_KIRKWOOD_PCIE_INIT is not set
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x0
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index d2f2ff4e23e7..65378d3cec16 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage.cfg"
CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_SYS_MALLOC_F_LEN=0x400
CONFIG_TARGET_KM_KIRKWOOD=y
+# CONFIG_KIRKWOOD_PCIE_INIT is not set
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0x0
CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 9654b8d8060c..8b54f9c7c842 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage_256M8_1.cfg"
CONFIG_SYS_TEXT_BASE=0x07d00000
CONFIG_SYS_MALLOC_F_LEN=0x400
CONFIG_TARGET_KM_KIRKWOOD=y
+# CONFIG_KIRKWOOD_PCIE_INIT is not set
CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_OFFSET=0xC0000
CONFIG_ENV_SECT_SIZE=0x10000
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index 8114373655f3..e42e6d56532f 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -9,10 +9,6 @@
/* additions for new ARM relocation support */
#define CONFIG_SYS_SDRAM_BASE 0x00000000
-#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */
-#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 */
-#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
-
/*
* NS16550 Configuration
*/
diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index b70829c09d58..8926c26b0bdf 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -9,10 +9,6 @@
/* additions for new ARM relocation support */
#define CONFIG_SYS_SDRAM_BASE 0x00000000
-#define CONFIG_KIRKWOOD_EGIGA_INIT /* Enable GbePort0/1 for kernel */
-#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 */
-#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
-
/*
* NS16550 Configuration
*/
diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h
index e58a69501b33..01482d531996 100644
--- a/include/configs/km_kirkwood.h
+++ b/include/configs/km_kirkwood.h
@@ -23,7 +23,6 @@
/* KM_KIRKWOOD */
#if defined(CONFIG_KM_KIRKWOOD)
#define CONFIG_HOSTNAME "km_kirkwood"
-#define CONFIG_KM_DISABLE_PCIE
/* KM_KIRKWOOD_PCI */
#elif defined(CONFIG_KM_KIRKWOOD_PCI)
@@ -34,7 +33,6 @@
/* KM_KIRKWOOD_128M16 */
#elif defined(CONFIG_KM_KIRKWOOD_128M16)
#define CONFIG_HOSTNAME "km_kirkwood_128m16"
-#define CONFIG_KM_DISABLE_PCIE
/* KM_NUSA */
#elif defined(CONFIG_KM_NUSA)
@@ -44,7 +42,6 @@
/* KMCOGE5UN */
#elif defined(CONFIG_KM_COGE5UN)
#define CONFIG_HOSTNAME "kmcoge5un"
-#define CONFIG_KM_DISABLE_PCIE
/* KM_SUSE2 */
#elif defined(CONFIG_KM_SUSE2)
@@ -118,8 +115,4 @@
MVGBE_SET_MII_SPEED_TO_100)
#endif
-#ifdef CONFIG_KM_DISABLE_PCIE
-#undef CONFIG_KIRKWOOD_PCIE_INIT
-#endif
-
#endif /* _CONFIG_KM_KIRKWOOD */
--
2.25.1
next prev parent reply other threads:[~2022-06-20 12:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 12:07 [PATCH 01/17] Convert CONFIG_FSL_FIXED_MMC_LOCATION et al to Kconfig Tom Rini
2022-06-20 12:07 ` [PATCH 02/17] lcd: Remove legacy CONFIG_FB_ADDR code Tom Rini
2022-06-20 12:07 ` [PATCH 03/17] Convert CONFIG_LAYERSCAPE_NS_ACCESS to Kconfig Tom Rini
2022-06-20 12:07 ` [PATCH 04/17] Convert CONFIG_PCIE1 et al " Tom Rini
2022-06-20 12:07 ` [PATCH 05/17] Convert CONFIG_PCIE_IMX " Tom Rini
2022-06-20 12:07 ` [PATCH 06/17] pci: Remove pci_sh4 and related defines Tom Rini
2022-06-20 12:07 ` [PATCH 07/17] Convert CONFIG_PCI_SCAN_SHOW to Kconfig Tom Rini
2022-06-20 12:07 ` [PATCH 08/17] Convert CONFIG_PCI_GT64120 " Tom Rini
2022-06-20 12:07 ` [PATCH 09/17] Convert CONFIG_PCI_CONFIG_HOST_BRIDGE " Tom Rini
2022-06-20 12:07 ` [PATCH 10/17] m68k: Remove unused PCI code Tom Rini
2022-06-20 12:07 ` [PATCH 11/17] MPC837XERDB: Remove unused PCI defines Tom Rini
2022-06-20 12:07 ` [PATCH 12/17] Convert CONFIG_SH7751_PCI to Kconfig Tom Rini
2022-06-20 12:07 ` [PATCH 13/17] socrates: Rework CONFIG_PCI_CLK_FREQ Tom Rini
2022-06-20 12:07 ` [PATCH 14/17] Convert CONFIG_PCI_MSC01 to Kconfig Tom Rini
2022-06-20 12:07 ` [PATCH 15/17] Convert CONFIG_SYS_FSL_PCI_VER_3_X " Tom Rini
2022-06-20 12:07 ` [PATCH 16/17] qemu-ppce500: Move CONFIG_SYS_PCI_MAP_{START, END} to board code Tom Rini
2022-06-20 12:07 ` Tom Rini [this message]
2022-07-06 16:02 ` [PATCH 01/17] Convert CONFIG_FSL_FIXED_MMC_LOCATION et al to Kconfig Tom Rini
2022-07-22 18:01 ` Tim Harvey
2022-07-22 19:06 ` Tom Rini
2022-07-22 20:05 ` Tim Harvey
2022-07-22 20:12 ` 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=20220620120758.765049-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