pci: Make PCI_INIT_R be selected rather than promptedWIP/select-some-syms-2

As this CONFIG option is for a hook, it should be selected when required
for a platform to function, rather than asked (or implied).

Signed-off-by: Tom Rini <trini@konsulko.com>

8 files changed, 9 insertions, 3 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7b2fe18..33b830a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1822,6 +1822,7 @@ config TARGET_SL28
 	select DM_SERIAL
 	select DM_SPI
 	select GPIO_EXTRA_HEADER
+	select PCI_INIT_R
 	select SPL_DM if SPL
 	select SPL_DM_SPI if SPL
 	select SPL_DM_SPI_FLASH if SPL
@@ -1839,6 +1840,7 @@ config TARGET_TEN64
 	select ARMV8_MULTIENTRY
 	select ARCH_SUPPORT_TFABOOT
 	select BOARD_LATE_INIT
+	select PCI_INIT_R
 	select SUPPORT_SPL
 	select FSL_DDR_INTERACTIVE if !SD_BOOT
 	select GPIO_EXTRA_HEADER
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 5df41da..d9266c6 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -225,6 +225,7 @@ config TARGET_GE_B1X5V2
 config TARGET_GW_VENTANA
 	bool "gw_ventana"
 	depends on MX6QDL
+	select PCI_INIT_R
 	select SUPPORT_SPL
 	select GATEWORKS_SC
 	select MISC
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index b695c7e..376a1c9 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -24,6 +24,7 @@ config TARGET_MPC837XERDB
 	bool "Support MPC837XERDB"
 	select ARCH_MPC837X
 	select BOARD_EARLY_INIT_F
+	select PCI_INIT_R
 	select SYS_83XX_DDR_USES_CS0
 
 config TARGET_KMETER1
diff --git a/board/emulation/qemu-arm/Kconfig b/board/emulation/qemu-arm/Kconfig
index ed99496..0c04d2f 100644
--- a/board/emulation/qemu-arm/Kconfig
+++ b/board/emulation/qemu-arm/Kconfig
@@ -6,6 +6,7 @@ config TEXT_BASE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select CMD_QFW
+	select PCI_INIT_R
 	select QFW_MMIO
 	imply VIRTIO_MMIO
 	imply VIRTIO_PCI
diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig
index 6114e1b..62ab376 100644
--- a/board/emulation/qemu-riscv/Kconfig
+++ b/board/emulation/qemu-riscv/Kconfig
@@ -28,11 +28,11 @@ config SPL_OPENSBI_LOAD_ADDR
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select GENERIC_RISCV
+	select PCI_INIT_R
 	select SUPPORT_SPL
 	imply AHCI
 	imply SMP
 	imply BOARD_LATE_INIT
-	imply PCI_INIT_R
 	imply SPL_RAM_SUPPORT
 	imply SPL_RAM_DEVICE
 	imply CMD_PCI
diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig
index 787751a..2399785 100644
--- a/board/emulation/qemu-x86/Kconfig
+++ b/board/emulation/qemu-x86/Kconfig
@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select QEMU
 	select QFW_PIO
 	select BOARD_ROMSIZE_KB_1024
+	select PCI_INIT_R
 	imply VIRTIO_PCI
 	imply VIRTIO_NET
 	imply VIRTIO_BLK
diff --git a/common/Kconfig b/common/Kconfig
index a2112e6..6c92b20 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -759,7 +759,7 @@ config SYS_I2C_EEPROM_NXID
 endchoice
 
 config PCI_INIT_R
-	bool "Enumerate PCI buses during init"
+	bool
 	depends on PCI
 	help
 	  With this option U-Boot will call pci_init() soon after relocation,
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index ef328d2..01e0044 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -108,7 +108,7 @@ config PCIE_ECAM_SYNQUACER
 config PCIE_APPLE
 	bool "Enable Apple PCIe driver"
 	depends on ARCH_APPLE
-	imply PCI_INIT_R
+	select PCI_INIT_R
 	default y
 	help
 	  Say Y here if you want to enable PCIe controller support on