Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 724368928c889bf754bea176f3e0aea5c1ec01b9

Authored by Bin Meng
1 parent b9342b2cc6
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

x86: Convert INTEL_ICH6_GPIO to Kconfig 

This converts Intel ICH6 GPIO driver to Kconfig, and add it to the
imply list of platform drivers.

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

Showing 9 changed files with 10 additions and 8 deletions Side-by-side Diff

arch/x86/cpu/baytrail/Kconfig
Diff comments   View file @ 7243689
... ... @@ -12,6 +12,7 @@
12 12 imply ENABLE_MRC_CACHE
13 13 imply ENV_IS_IN_SPI_FLASH
14 14 imply ICH_SPI
  15 + imply INTEL_ICH6_GPIO
15 16 imply MMC
16 17 imply MMC_PCI
17 18 imply MMC_SDHCI
arch/x86/cpu/ivybridge/Kconfig
Diff comments   View file @ 7243689
... ... @@ -12,6 +12,7 @@
12 12 imply ENABLE_MRC_CACHE
13 13 imply ENV_IS_IN_SPI_FLASH
14 14 imply ICH_SPI
  15 + imply INTEL_ICH6_GPIO
15 16 imply SCSI
16 17 imply SPI_FLASH
17 18 imply USB
arch/x86/cpu/quark/Kconfig
Diff comments   View file @ 7243689
... ... @@ -13,6 +13,7 @@
13 13 imply ENV_IS_IN_SPI_FLASH
14 14 imply ETH_DESIGNWARE
15 15 imply ICH_SPI
  16 + imply INTEL_ICH6_GPIO
16 17 imply MMC
17 18 imply MMC_PCI
18 19 imply MMC_SDHCI
arch/x86/cpu/queensbay/Kconfig
Diff comments   View file @ 7243689
... ... @@ -11,6 +11,7 @@
11 11 select ARCH_EARLY_INIT_R
12 12 imply ENV_IS_IN_SPI_FLASH
13 13 imply ICH_SPI
  14 + imply INTEL_ICH6_GPIO
14 15 imply MMC
15 16 imply MMC_PCI
16 17 imply MMC_SDHCI
drivers/gpio/Kconfig
Diff comments   View file @ 7243689
... ... @@ -67,6 +67,12 @@
67 67 driver from the common Intel ICH6 driver. It supports a total of
68 68 95 GPIOs which can be configured from the device tree.
69 69  
  70 +config INTEL_ICH6_GPIO
  71 + bool "Intel ICH6 compatible legacy GPIO driver"
  72 + depends on DM_GPIO
  73 + help
  74 + Say yes here to select Intel ICH6 compatible legacy GPIO driver.
  75 +
70 76 config IMX_RGPIO2P
71 77 bool "i.MX7ULP RGPIO2P driver"
72 78 depends on DM
include/configs/efi-x86.h
Diff comments   View file @ 7243689
... ... @@ -14,7 +14,6 @@
14 14 #undef CONFIG_TPM_TIS_BASE_ADDRESS
15 15  
16 16 #undef CONFIG_SCSI_AHCI
17   -#undef CONFIG_INTEL_ICH6_GPIO
18 17 #undef CONFIG_USB_EHCI_PCI
19 18  
20 19 #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \
include/configs/qemu-x86.h
Diff comments   View file @ 7243689
... ... @@ -44,9 +44,6 @@
44 44 {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_AHCI}
45 45 #endif
46 46  
47   -/* GPIO is not supported */
48   -#undef CONFIG_INTEL_ICH6_GPIO
49   -
50 47 /* SPI is not supported */
51 48  
52 49 #define CONFIG_SPL_FRAMEWORK
include/configs/x86-common.h
Diff comments   View file @ 7243689
... ... @@ -63,9 +63,6 @@
63 63  
64 64 #define CONFIG_SUPPORT_VFAT
65 65  
66   -/* x86 GPIOs are accessed through a PCI device */
67   -#define CONFIG_INTEL_ICH6_GPIO
68   -
69 66 /*-----------------------------------------------------------------------
70 67 * Command line configuration.
71 68 */
scripts/config_whitelist.txt
Diff comments   View file @ 7243689
... ... @@ -1154,7 +1154,6 @@
1154 1154 CONFIG_INI_MAX_NAME
1155 1155 CONFIG_INI_MAX_SECTION
1156 1156 CONFIG_INTEGRITY
1157   -CONFIG_INTEL_ICH6_GPIO
1158 1157 CONFIG_INTERRUPTS
1159 1158 CONFIG_IO
1160 1159 CONFIG_IO64