From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 27 Jun 2009 16:17:18 +0000 (+0000)
Subject: only register fallback sprom and enable PCI if we actually have support for PCI
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7da8855c79414434964e13f6555f783b52a6005b;p=openwrt%2Fstaging%2Fdangole.git

only register fallback sprom and enable PCI if we actually have support for PCI

SVN-Revision: 16581
---

diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
index ff7cf56974..3e767d8a63 100644
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -378,13 +378,13 @@ void __init board_prom_init(void)
 	 * this has to be done this early since PCI init is done
 	 * inside arch_initcall */
 	val = 0;
-
+#ifdef CONFIG_PCI
 	if (board.has_pci) {
 		bcm63xx_pci_enabled = 1;
 		if (BCMCPU_IS_6348())
 			val |= GPIO_MODE_6348_G2_PCI;
 	}
-
+#endif
 	if (board.has_pccard) {
 		if (BCMCPU_IS_6348())
 			val |= GPIO_MODE_6348_G1_MII_PCCARD;
@@ -538,12 +538,14 @@ int __init board_register_devices(void)
 		bcm63xx_udc_register();
 	/* Generate MAC address for WLAN and
 	 * register our SPROM */
+#ifdef CONFIG_PCI
 	if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
 		memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
 		memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
 		if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0)
 			printk(KERN_ERR "failed to register fallback SPROM\n");
 	}
+#endif
 
 	/* read base address of boot chip select (0) */
 	val = bcm_mpi_readl(MPI_CSBASE_REG(0));