| Message ID | 1528637118-32739-3-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | fcfc8a82b10c8acb844b8f0ed6c5d2cadce1291f |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: efi: Fixes and enhancements to application and payload support | expand |
On 10 June 2018 at 05:25, Bin Meng <bmeng.cn@gmail.com> wrote: > 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> > --- > > arch/x86/Kconfig | 6 ++++++ > arch/x86/cpu/baytrail/Kconfig | 1 + > arch/x86/cpu/ivybridge/Kconfig | 1 + > arch/x86/lib/Makefile | 2 +- > 4 files changed, 9 insertions(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Jun 11, 2018 at 10:53 PM, Simon Glass <sjg@chromium.org> wrote: > On 10 June 2018 at 05:25, Bin Meng <bmeng.cn@gmail.com> wrote: >> 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> >> --- >> >> arch/x86/Kconfig | 6 ++++++ >> arch/x86/cpu/baytrail/Kconfig | 1 + >> arch/x86/cpu/ivybridge/Kconfig | 1 + >> arch/x86/lib/Makefile | 2 +- >> 4 files changed, 9 insertions(+), 1 deletion(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86, thanks!
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c145799..460aed6 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -744,6 +744,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 ac58b03..022a9f2 100644 --- 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 e31c33c..ea25ff3 100644 --- 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 51d451f..2adb236 100644 --- 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
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> --- arch/x86/Kconfig | 6 ++++++ arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/lib/Makefile | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-)