CONFIG_SPL_PCI_PNP=y without CONFIG_SPL_PCI=y makes no sense.
Move CONFIG_SPL_PCI_PNP to the SPL menu and add the missing dependency.
Fixes: 32f5e9e5c1a7 ("nvme: pci: Enable for SPL")
Signed-off-by: Heinrich Schuchardt <heinrich.schucha...@canonical.com>
---
common/spl/Kconfig | 12 ++++++++++++
drivers/pci/Kconfig | 11 -----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index bee231b583..089bc9c0cb 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1153,6 +1153,18 @@ config SPL_PCI
necessary driver support. This enables the drivers in drivers/pci
as part of an SPL build.
+config SPL_PCI_PNP
+ bool "Enable Plug & Play support for PCI"
+ depends on SPL_PCI
+ help
+ Enable PCI memory and I/O space resource allocation and assignment.
+
+ This is required to auto configure the enumerated devices.
+
+ This is normally not done in SPL, but can be enabled if devices must
+ be set up in the SPL phase. Often it is enough to manually configure
+ one device, so this option can be disabled.
+
config SPL_PCH
bool "Support PCH drivers"
help
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index aca439d921..60d98d1464 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -40,17 +40,6 @@ config PCI_PNP
help
Enable PCI memory and I/O space resource allocation and assignment.
-config SPL_PCI_PNP
- bool "Enable Plug & Play support for PCI"
- help
- Enable PCI memory and I/O space resource allocation and assignment.
-
- This is required to auto configure the enumerated devices.
-
- This is normally not done in SPL, but can be enabled if devices must
- be set up in the SPL phase. Often it is enough to manually configure
- one device, so this option can be disabled.
-
config PCI_REGION_MULTI_ENTRY
bool "Enable Multiple entries of region type MEMORY in ranges for PCI"
help
--
2.40.1
