diff mbox

[U-Boot,v2,03/22] x86: kconfig: Select PCI and DM_PCI

Message ID 1501421008-5737-4-git-send-email-bmeng.cn@gmail.com
State Accepted
Delegated to: Bin Meng
Headers show

Commit Message

Bin Meng July 30, 2017, 1:23 p.m. UTC 
PCI is the de facto interconnect bus in an x86 system.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---

Changes in v2: None

 arch/Kconfig                                            | 2 ++
 configs/bayleybay_defconfig                             | 1 -
 configs/chromebook_link64_defconfig                     | 1 -
 configs/chromebook_link_defconfig                       | 1 -
 configs/chromebook_samus_defconfig                      | 1 -
 configs/chromebox_panther_defconfig                     | 1 -
 configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 -
 configs/conga-qeval20-qa3-e3845_defconfig               | 1 -
 configs/coreboot-x86_defconfig                          | 1 -
 configs/cougarcanyon2_defconfig                         | 1 -
 configs/crownbay_defconfig                              | 1 -
 configs/dfi-bt700-q7x-151_defconfig                     | 1 -
 configs/edison_defconfig                                | 1 -
 configs/efi-x86_defconfig                               | 1 -
 configs/galileo_defconfig                               | 1 -
 configs/minnowmax_defconfig                             | 1 -
 configs/qemu-x86_64_defconfig                           | 1 -
 configs/qemu-x86_defconfig                              | 1 -
 configs/qemu-x86_efi_payload32_defconfig                | 1 -
 configs/qemu-x86_efi_payload64_defconfig                | 1 -
 configs/som-db5800-som-6867_defconfig                   | 1 -
 configs/theadorable-x86-dfi-bt700_defconfig             | 1 -
 drivers/pci/Kconfig                                     | 2 +-
 23 files changed, 3 insertions(+), 22 deletions(-)

Comments

Simon Glass Aug. 1, 2017, 9:11 a.m. UTC | #1 
On 30 July 2017 at 07:23, Bin Meng <bmeng.cn@gmail.com> wrote:
> PCI is the de facto interconnect bus in an x86 system.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> ---
>
> Changes in v2: None
>
>  arch/Kconfig                                            | 2 ++
>  configs/bayleybay_defconfig                             | 1 -
>  configs/chromebook_link64_defconfig                     | 1 -
>  configs/chromebook_link_defconfig                       | 1 -
>  configs/chromebook_samus_defconfig                      | 1 -
>  configs/chromebox_panther_defconfig                     | 1 -
>  configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 -
>  configs/conga-qeval20-qa3-e3845_defconfig               | 1 -
>  configs/coreboot-x86_defconfig                          | 1 -
>  configs/cougarcanyon2_defconfig                         | 1 -
>  configs/crownbay_defconfig                              | 1 -
>  configs/dfi-bt700-q7x-151_defconfig                     | 1 -
>  configs/edison_defconfig                                | 1 -
>  configs/efi-x86_defconfig                               | 1 -
>  configs/galileo_defconfig                               | 1 -
>  configs/minnowmax_defconfig                             | 1 -
>  configs/qemu-x86_64_defconfig                           | 1 -
>  configs/qemu-x86_defconfig                              | 1 -
>  configs/qemu-x86_efi_payload32_defconfig                | 1 -
>  configs/qemu-x86_efi_payload64_defconfig                | 1 -
>  configs/som-db5800-som-6867_defconfig                   | 1 -
>  configs/theadorable-x86-dfi-bt700_defconfig             | 1 -
>  drivers/pci/Kconfig                                     | 2 +-
>  23 files changed, 3 insertions(+), 22 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
Bin Meng Aug. 1, 2017, 12:22 p.m. UTC | #2 
On Tue, Aug 1, 2017 at 5:11 PM, Simon Glass <sjg@chromium.org> wrote:
> On 30 July 2017 at 07:23, Bin Meng <bmeng.cn@gmail.com> wrote:
>> PCI is the de facto interconnect bus in an x86 system.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
>> ---
>>
>> Changes in v2: None
>>
>>  arch/Kconfig                                            | 2 ++
>>  configs/bayleybay_defconfig                             | 1 -
>>  configs/chromebook_link64_defconfig                     | 1 -
>>  configs/chromebook_link_defconfig                       | 1 -
>>  configs/chromebook_samus_defconfig                      | 1 -
>>  configs/chromebox_panther_defconfig                     | 1 -
>>  configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 -
>>  configs/conga-qeval20-qa3-e3845_defconfig               | 1 -
>>  configs/coreboot-x86_defconfig                          | 1 -
>>  configs/cougarcanyon2_defconfig                         | 1 -
>>  configs/crownbay_defconfig                              | 1 -
>>  configs/dfi-bt700-q7x-151_defconfig                     | 1 -
>>  configs/edison_defconfig                                | 1 -
>>  configs/efi-x86_defconfig                               | 1 -
>>  configs/galileo_defconfig                               | 1 -
>>  configs/minnowmax_defconfig                             | 1 -
>>  configs/qemu-x86_64_defconfig                           | 1 -
>>  configs/qemu-x86_defconfig                              | 1 -
>>  configs/qemu-x86_efi_payload32_defconfig                | 1 -
>>  configs/qemu-x86_efi_payload64_defconfig                | 1 -
>>  configs/som-db5800-som-6867_defconfig                   | 1 -
>>  configs/theadorable-x86-dfi-bt700_defconfig             | 1 -
>>  drivers/pci/Kconfig                                     | 2 +-
>>  23 files changed, 3 insertions(+), 22 deletions(-)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>

applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/arch/Kconfig b/arch/Kconfig
index 193e494..b062826 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -93,6 +93,8 @@  config X86
 	select DM_KEYBOARD
 	select DM_SERIAL
 	select DM_GPIO
+	select PCI
+	select DM_PCI
 	select DM_SPI
 	select DM_SPI_FLASH
 	select TIMER
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index d6798be..6572a38 100644
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -58,7 +58,6 @@  CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig
index 9946ab3..5224497 100644
--- a/configs/chromebook_link64_defconfig
+++ b/configs/chromebook_link64_defconfig
@@ -70,7 +70,6 @@  CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index ddd1349..495a5bc 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -53,7 +53,6 @@  CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig
index bbfb238..39a9b0d 100644
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -50,7 +50,6 @@  CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_GIGADEVICE=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index c38948a..4052f5c 100644
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -48,7 +48,6 @@  CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_RTL8169=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index f21736e..e88751d 100644
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -61,7 +61,6 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index 009b94d..8c6733f 100644
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -60,7 +60,6 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 3165a8b..3a08dc4 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -40,7 +40,6 @@  CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_TPM_TIS_LPC=y
diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index 8eb83ac..2e729fa 100644
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -33,7 +33,6 @@  CONFIG_SYSCON=y
 CONFIG_SCSI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index a852a33..af9c3c0 100644
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -50,7 +50,6 @@  CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
 CONFIG_PCH_GBE=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index fd84bb8..5543e94 100644
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -58,7 +58,6 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index de8b36a..02bc760 100644
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -35,7 +35,6 @@  CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_TANGIER=y
-CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_DM_RTC=y
 CONFIG_INTEL_MID_SERIAL=y
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index 36be406..26db27b 100644
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -32,7 +32,6 @@  CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
-CONFIG_DM_PCI=y
 CONFIG_DEBUG_EFI_CONSOLE=y
 CONFIG_DEBUG_UART_BASE=0
 CONFIG_DEBUG_UART_CLOCK=0
diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 81c0d13..a842db0 100644
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -52,7 +52,6 @@  CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index 03b9d42..f610765 100644
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -60,7 +60,6 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_RTL8169=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig
index 94041ee..1e472e5 100644
--- a/configs/qemu-x86_64_defconfig
+++ b/configs/qemu-x86_64_defconfig
@@ -65,7 +65,6 @@  CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 0f94f42..cf9ed9f 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -45,7 +45,6 @@  CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_DM_USB=y
diff --git a/configs/qemu-x86_efi_payload32_defconfig b/configs/qemu-x86_efi_payload32_defconfig
index 3ac4251..6b11630 100644
--- a/configs/qemu-x86_efi_payload32_defconfig
+++ b/configs/qemu-x86_efi_payload32_defconfig
@@ -42,7 +42,6 @@  CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_DM_USB=y
diff --git a/configs/qemu-x86_efi_payload64_defconfig b/configs/qemu-x86_efi_payload64_defconfig
index ef4cda5..d1964c2 100644
--- a/configs/qemu-x86_efi_payload64_defconfig
+++ b/configs/qemu-x86_efi_payload64_defconfig
@@ -43,7 +43,6 @@  CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_DM_USB=y
diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 29671ae..ae0bbb3 100644
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -52,7 +52,6 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 35cac6a..027bfb7 100644
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -59,7 +59,6 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DM_ETH=y
 CONFIG_E1000=y
-CONFIG_DM_PCI=y
 CONFIG_DM_RTC=y
 CONFIG_SYS_NS16550=y
 CONFIG_ICH_SPI=y
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 692a398..e2a1c0a 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -1,6 +1,6 @@ 
 menuconfig PCI
 	bool "PCI support"
-	default y if PPC || X86
+	default y if PPC
 	help
 	  Enable support for PCI (Peripheral Interconnect Bus), a type of bus
 	  used on some devices to allow the CPU to communicate with its