diff options
| author | Tom Rini <[email protected]> | 2021-09-13 18:23:24 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-09-13 18:23:24 -0400 |
| commit | eafcaf8a6e40709c7420e73701c540ebb6aab043 (patch) | |
| tree | 2d5ca9ca127c472cf24cf163a3e7f745722141eb /lib | |
| parent | 7958292f5ffa4ecdaaf4c73c6df28006051db6e0 (diff) | |
| parent | 3232bdf0b30b057ace64f192bc55a0bed4199770 (diff) | |
Merge branch '2021-09-09-finish-pre-DM_PCI-removal'
- Finish removing the non-DM_PCI legacy code.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fdtdec.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 337c4443b03..7358cb6dd16 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -190,7 +190,6 @@ fdt_addr_t fdtdec_get_addr(const void *blob, int node, const char *prop_name) return fdtdec_get_addr_size(blob, node, prop_name, NULL); } -#if CONFIG_IS_ENABLED(PCI) && defined(CONFIG_DM_PCI) int fdtdec_get_pci_vendev(const void *blob, int node, u16 *vendor, u16 *device) { const char *list, *end; @@ -238,7 +237,15 @@ int fdtdec_get_pci_bar32(const struct udevice *dev, struct fdt_pci_addr *addr, return -EINVAL; barnum = (barnum - PCI_BASE_ADDRESS_0) / 4; + + /* + * There is a strange toolchain bug with nds32 which complains about + * an undefined reference here, even if fdtdec_get_pci_bar32() is never + * called. An #ifdef seems to be the only fix! + */ +#if !IS_ENABLED(CONFIG_NDS32) *bar = dm_pci_read_bar32(dev, barnum); +#endif return 0; } @@ -258,7 +265,6 @@ int fdtdec_get_pci_bus_range(const void *blob, int node, return 0; } -#endif uint64_t fdtdec_get_uint64(const void *blob, int node, const char *prop_name, uint64_t default_val) |