Fixing build regressions for the Integrator I get find that a few
boards try to work around the missing declaration of
pciauto_config_init() by declaring it in the local scope. This
does not make sense when the sibling functions are in <pci.h>
so move the function to the header, ridding the build error
in the Integrator and getting rid of the local declarations
here and there.
Reported-by: Wolfgang Denk <w...@denx.de>
Signed-off-by: Linus Walleij <linus.wall...@linaro.org>
---
board/esd/cpci750/pci.c | 1 -
board/prodrive/p3mx/pci.c | 1 -
drivers/pci/fsl_pci_init.c | 1 -
drivers/pci/pci.c | 1 -
include/pci.h | 1 +
5 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/board/esd/cpci750/pci.c b/board/esd/cpci750/pci.c
index a2c1c50..24ab13f 100644
--- a/board/esd/cpci750/pci.c
+++ b/board/esd/cpci750/pci.c
@@ -29,7 +29,6 @@
#include <pci.h>
#ifdef CONFIG_PCI_PNP
-void pciauto_config_init(struct pci_controller *hose);
int pciauto_region_allocate(struct pci_region* res, unsigned int size,
unsigned int *bar);
#endif
diff --git a/board/prodrive/p3mx/pci.c b/board/prodrive/p3mx/pci.c
index e36b676..712c21c 100644
--- a/board/prodrive/p3mx/pci.c
+++ b/board/prodrive/p3mx/pci.c
@@ -29,7 +29,6 @@
#include <pci.h>
#ifdef CONFIG_PCI_PNP
-void pciauto_config_init(struct pci_controller *hose);
int pciauto_region_allocate(struct pci_region* res, unsigned int size,
unsigned int *bar);
#endif
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index bff1314..d04a08c 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -51,7 +51,6 @@ void pciauto_prescan_setup_bridge(struct pci_controller *hose,
pci_dev_t dev, int sub_bus);
void pciauto_postscan_setup_bridge(struct pci_controller *hose,
pci_dev_t dev, int sub_bus);
-void pciauto_config_init(struct pci_controller *hose);
#ifndef CONFIG_SYS_PCI_MEMORY_BUS
#define CONFIG_SYS_PCI_MEMORY_BUS 0
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index bee2b52..007b850 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -518,7 +518,6 @@ void pci_cfgfunc_do_nothing(struct pci_controller *hose,
* to get the correct result when scanning bridges
*/
extern int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev);
-extern void pciauto_config_init(struct pci_controller *hose);
#if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI_SCAN_SHOW)
const char * pci_class_str(u8 class)
diff --git a/include/pci.h b/include/pci.h
index 1284c42..7d98ad4 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -527,6 +527,7 @@ extern void pciauto_setup_device(struct pci_controller
*hose,
struct pci_region *mem,
struct pci_region *prefetch,
struct pci_region *io);
+extern void pciauto_config_init(struct pci_controller *hose);
int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev);
extern pci_dev_t pci_find_device (unsigned int vendor, unsigned int device,
int index);
--
1.7.7.6
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
