Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/87092?usp=email )
Change subject: commonlib/storage: Avoid build error when CONFIG_PCI is disabled ......................................................................
commonlib/storage: Avoid build error when CONFIG_PCI is disabled
When CONFIG_PCI is disabled, but COMMONLIB_STORAGE and COMMONLIB_STORAGE_SD are enabled, the compilation of pci_sdhci.c fails. This is because the code attempts to use pci_s_read_config32() with the PCI_BASE_ADDRESS_0 macro, which are only defined when CONFIG_PCI is enabled.
Add an early return NULL check based on !CONFIG(PCI) at the beginning of new_pci_sdhci_controller(). This prevents the compiler from attempting to process the PCI-specific code path when PCI support is not configured, resolving the build failure in this specific Kconfig scenario.
TEST=Able to build herobrine.
Change-Id: I5c70d9b9ebcac13b47bba2c260fdf2ad7d56d4d7 Signed-off-by: Subrata Banik subratabanik@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/87092 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Kapil Porwal kapilporwal@google.com --- M src/commonlib/storage/pci_sdhci.c 1 file changed, 4 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Kapil Porwal: Looks good to me, approved
diff --git a/src/commonlib/storage/pci_sdhci.c b/src/commonlib/storage/pci_sdhci.c index f7922d4..51b44de 100644 --- a/src/commonlib/storage/pci_sdhci.c +++ b/src/commonlib/storage/pci_sdhci.c @@ -2,6 +2,7 @@
#include <commonlib/sdhci.h> #include <device/pci.h> +#include <device/pci_def.h> #include <device/pci_ops.h> #include <stdint.h>
@@ -42,6 +43,9 @@ { uintptr_t addr;
+ if (!CONFIG(PCI)) + return NULL; + addr = pci_s_read_config32(dev, PCI_BASE_ADDRESS_0); if (addr == ((uint32_t)~0)) { sdhc_error("Error: PCI SDHCI not found\n");