mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-02-17 22:49:02 +00:00
pci: Drop DM_PCI check from fdtdec
We don't need this check anymore since when PCI is enabled, driver model is always used. Sadly this doesn't work with nds32 for some reason to do with the toolchain. Add a work-around for that. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
26543cc6fa
commit
b717f2f2d1
1 changed files with 8 additions and 2 deletions
10
lib/fdtdec.c
10
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)
|
||||
|
|
Loading…
Add table
Reference in a new issue