aboutsummaryrefslogtreecommitdiff
path: root/common/spl/Kconfig
diff options
context:
space:
mode:
authorSekhar Nori2018-12-06 15:40:08 +0530
committerTom Rini2018-12-12 12:14:23 -0500
commitd50d6817b583d20bf1c6e26c656d125bde5e4e4b (patch)
tree550ddec7d8ac60e8f215c45c3ccba989e176698e /common/spl/Kconfig
parenta6f6939e87c7d70f4844a73bc115caaf9c0a19e0 (diff)
spl: fix build failure with !CONFIG_SPL_PCI_SUPPORT
Building U-Boot with CONFIG_PCI and CONFIG_DM_PCI enabled, but CONFIG_SPL_PCI_SUPPORT disabled, results in following linker error: lib/built-in.o: In function `fdtdec_get_pci_bar32': lib/fdtdec.c:305: undefined reference to `dm_pci_read_bar32' fdtdec.c:305:(.text.fdtdec_get_pci_bar32+0x24): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `dm_pci_read_bar32' This is because reference to dm_pci_read_bar32() remains in lib/fdtdec.c while SPL build does not descend into drivers/pci directory in drivers/Makefile if CONFIG_SPL_PCI_SUPPORT is not enabled. Fix this by applying appropriate #define guards in lib/fdtdec.c. It looks like ns16550.c has the same problem, so fixed that too. To simplify this, CONFIG_SPL_PCI_SUPPORT is renamed to CONFIG_SPL_PCI (enables use of CONFIG_IS_ENABLED() macro). Suggested-by: Vignesh R <vigneshr@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/spl/Kconfig')
-rw-r--r--common/spl/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index cab7220c9ac..953841ebe76 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -612,7 +612,7 @@ config SPL_PAYLOAD
TPL, tpl/u-boot-with-tpl.bin. For new boards, suggest to
use u-boot.img.
-config SPL_PCI_SUPPORT
+config SPL_PCI
bool "Support PCI drivers"
help
Enable support for PCI in SPL. For platforms that need PCI to boot,
@@ -1026,7 +1026,7 @@ config TPL_NAND_SUPPORT
help
Enable support for NAND in TPL. See SPL_NAND_SUPPORT for details.
-config TPL_PCI_SUPPORT
+config TPL_PCI
bool "Support PCI drivers"
help
Enable support for PCI in TPL. For platforms that need PCI to boot,