From 00f93bdf983f4d35864bdecddf25e7d299fb3a8b Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Tue, 29 Dec 2020 15:52:09 +0800 Subject: [PATCH] drivers: pci: separate SPL & U-Boot proper build It fixes SPL compile issue after PCI enabled. Signed-off-by: Joseph Chen Change-Id: Ic3d4a464defd2074be083effd25f513ae19d2e01 --- drivers/serial/ns16550.c | 2 +- lib/fdtdec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index b4d1fa56bc..cb7cfa8ba7 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -521,7 +521,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) /* try Processor Local Bus device first */ addr = dev_read_addr(dev); -#if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI) +#if defined(CONFIG_PCI) && CONFIG_IS_ENABLED(DM_PCI) if (addr == FDT_ADDR_T_NONE) { /* then try pci device */ struct fdt_pci_addr pci_addr; diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 5b637f2639..f6a782d8e2 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -186,7 +186,7 @@ fdt_addr_t fdtdec_get_addr(const void *blob, int node, return fdtdec_get_addr_size(blob, node, prop_name, NULL); } -#if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI) +#if defined(CONFIG_PCI) && CONFIG_IS_ENABLED(DM_PCI) int fdtdec_get_pci_addr(const void *blob, int node, enum fdt_pci_space type, const char *prop_name, struct fdt_pci_addr *addr) {