[PATCH 02/23] pch: Rename PCH_SUPPORT to PCH
Simon Glass
sjg at chromium.org
Sun Aug 8 20:20:10 CEST 2021
Rename these options so that CONFIG_IS_ENABLED can be used with them.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
arch/x86/cpu/apollolake/Kconfig | 6 +++---
common/spl/Kconfig | 4 ++--
configs/chromebook_link64_defconfig | 2 +-
configs/chromebook_samus_tpl_defconfig | 4 ++--
configs/qemu-x86_64_defconfig | 2 +-
drivers/Makefile | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/x86/cpu/apollolake/Kconfig b/arch/x86/cpu/apollolake/Kconfig
index b3ce053173a..b710a653713 100644
--- a/arch/x86/cpu/apollolake/Kconfig
+++ b/arch/x86/cpu/apollolake/Kconfig
@@ -12,10 +12,10 @@ config INTEL_APOLLOLAKE
select INTEL_SOC
select INTEL_PMC
select TPL_X86_TSC_TIMER_NATIVE
- select SPL_PCH_SUPPORT
- select TPL_PCH_SUPPORT
+ select SPL_PCH
+ select TPL_PCH
select PCIEX_LENGTH_256MB
- select PCH_SUPPORT
+ select PCH
select P2SB
select SMP_AP_WORK
select INTEL_GMA_SWSMISCI
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 48ce2a213f1..e7d58a20e2b 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1008,7 +1008,7 @@ config SPL_PCI
necessary driver support. This enables the drivers in drivers/pci
as part of an SPL build.
-config SPL_PCH_SUPPORT
+config SPL_PCH
bool "Support PCH drivers"
help
Enable support for PCH (Platform Controller Hub) devices in SPL.
@@ -1546,7 +1546,7 @@ config TPL_PCI
necessary driver support. This enables the drivers in drivers/pci
as part of a TPL build.
-config TPL_PCH_SUPPORT
+config TPL_PCH
bool "Support PCH drivers"
help
Enable support for PCH (Platform Controller Hub) devices in TPL.
diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig
index b48505aa1e2..10d4fd1462e 100644
--- a/configs/chromebook_link64_defconfig
+++ b/configs/chromebook_link64_defconfig
@@ -37,7 +37,7 @@ CONFIG_SPL_I2C=y
CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_NET_SUPPORT=y
CONFIG_SPL_PCI=y
-CONFIG_SPL_PCH_SUPPORT=y
+CONFIG_SPL_PCH=y
CONFIG_SPL_RTC_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CPU=y
diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig
index 6eef4ba896f..d97c305110c 100644
--- a/configs/chromebook_samus_tpl_defconfig
+++ b/configs/chromebook_samus_tpl_defconfig
@@ -36,9 +36,9 @@ CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_NET_SUPPORT=y
CONFIG_SPL_PCI=y
-CONFIG_SPL_PCH_SUPPORT=y
+CONFIG_SPL_PCH=y
CONFIG_TPL_PCI=y
-CONFIG_TPL_PCH_SUPPORT=y
+CONFIG_TPL_PCH=y
CONFIG_TPL_DM_SPI=y
CONFIG_TPL_DM_SPI_FLASH=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
index 3a3b81c8b83..62016e9b633 100644
--- a/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@ -36,7 +36,7 @@ CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_NET_SUPPORT=y
CONFIG_SPL_PCI=y
-CONFIG_SPL_PCH_SUPPORT=y
+CONFIG_SPL_PCH=y
CONFIG_SPL_RTC_SUPPORT=y
CONFIG_CMD_CPU=y
CONFIG_CMD_BOOTEFI_SELFTEST=y
diff --git a/drivers/Makefile b/drivers/Makefile
index dc0ed4cec4a..d2d641196d8 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_$(SPL_TPL_)LED) += led/
obj-$(CONFIG_$(SPL_TPL_)MMC) += mmc/
obj-y += mtd/
obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux/
-obj-$(CONFIG_$(SPL_TPL_)PCH_SUPPORT) += pch/
+obj-$(CONFIG_$(SPL_TPL_)PCH) += pch/
obj-$(CONFIG_$(SPL_TPL_)PCI) += pci/
obj-$(CONFIG_$(SPL_TPL_)PHY) += phy/
obj-$(CONFIG_$(SPL_TPL_)PINCTRL) += pinctrl/
--
2.32.0.605.g8dce9f2422-goog
More information about the U-Boot
mailing list