pch: Rename PCH_SUPPORT to PCH

Rename these options so that CONFIG_IS_ENABLED can be used with them.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/apollolake/Kconfig b/arch/x86/cpu/apollolake/Kconfig
index b3ce053173a81199000ddcafcbc1221cf5f84564..b710a653713aa73f83aebac2a9a44e06fb7c745f 100644 (file)
--- 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 f640069434f4f4d794bdfaabfabb0d0376e02d90..93eff14e9a36d6e3f163bb6789b8eab0e847840e 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1004,7 +1004,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.
@@ -1540,7 +1540,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 b48505aa1e20fc55fd44749757d72540fa5cd7c2..10d4fd1462e5e405bab61037bebee97db4fd6e85 100644 (file)
--- 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 6eef4ba896ff5195c30e0244ef3668712ac336ca..d97c305110ca142b1e5daa1d81df4a1206646c10 100644 (file)
--- 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 3a3b81c8b83bf273d946ce844b485b11422f6add..62016e9b6336b1aae41bf7f592ce159777b61bf9 100644 (file)
--- 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 52fed3d0537d0494a1f65cd93ae8b871ce15bb6c..3a82ad664bafb998a6452ea3954c96dd4a3fbbc5 100644 (file)
--- 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/