x86: Conditionally build the pinctrl_ich6 driver

The pinctrl_ich6 driver is currently unconditionally built for all
x86 boards. Let's use a Kconfig option to control the build.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5c23b2cb57f1dd46e6c2a76c5c5deb53a3a56aed..18c7fb2d496771a7abf58c56aa2053e2d348fd0a 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -735,6 +735,12 @@ config I8259_PIC
          slave) interrupt controllers. Include this to have U-Boot set up
          the interrupt correctly.
 
+config PINCTRL_ICH6
+       bool
+       help
+         Intel ICH6 compatible chipset pinctrl driver. It needs to work
+         together with the ICH6 compatible gpio driver.
+
 config I8254_TIMER
        bool
        default y

diff --git a/arch/x86/cpu/baytrail/Kconfig b/arch/x86/cpu/baytrail/Kconfig
index ac58b03810adf4e26939a6a30eb29a150d9d2748..022a9f2e51cb7a46f8a16b0c2bb319c9c09bb8a7 100644 (file)
--- a/arch/x86/cpu/baytrail/Kconfig
+++ b/arch/x86/cpu/baytrail/Kconfig
@@ -12,6 +12,7 @@ config INTEL_BAYTRAIL
        imply AHCI_PCI
        imply ICH_SPI
        imply INTEL_ICH6_GPIO
+       imply PINCTRL_ICH6
        imply MMC
        imply MMC_PCI
        imply MMC_SDHCI

diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig
index eec92df1bcf224068187e4d346a7fa75a660e5b0..5f0e60837ca18a8f2ce2e4072d6ba6b130969de9 100644 (file)
--- a/arch/x86/cpu/ivybridge/Kconfig
+++ b/arch/x86/cpu/ivybridge/Kconfig
@@ -13,6 +13,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE
        imply AHCI_PCI
        imply ICH_SPI
        imply INTEL_ICH6_GPIO
+       imply PINCTRL_ICH6
        imply SCSI
        imply SCSI_AHCI
        imply SPI_FLASH

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 5a64f6eddc7521199f8deb52db86cedf213c05b5..e80a7ce2bd2c9713a9675835839230cbfed3dc53 100644 (file)
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o
 obj-y  += northbridge-uclass.o
 obj-$(CONFIG_I8259_PIC) += i8259.o
 obj-$(CONFIG_I8254_TIMER) += i8254.o
-obj-y  += pinctrl_ich6.o
+obj-$(CONFIG_PINCTRL_ICH6) += pinctrl_ich6.o
 obj-y  += pirq_routing.o
 obj-y  += relocate.o
 obj-y += physmem.o