Skip to contentSkip to conversation

powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n

PATCH Applied Anton Vorontsov 2 participants 2 messages Apr 16, 2010 – Apr 20, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n

Currently some MPC85xx and MPC86xx boards fail to build without CONFIG_PCI:

arch/powerpc/platforms/fsl_uli1575.c: In function 'quirk_final_uli5249':
arch/powerpc/platforms/fsl_uli1575.c:234: error: implicit declaration of function 'pci_bus_for_each_resource' arch/powerpc/platforms/fsl_uli1575.c:234: error: expected ';' before '{' token
cc1: warnings being treated as errors
arch/powerpc/platforms/fsl_uli1575.c:223: warning: unused variable 'dummy'
make[1]: *** [arch/powerpc/platforms/fsl_uli1575.o] Error 1

This patch fixes the issue by appending 'if PCI' condition when selecting FSL_ULI1575 Kconfig symbol.

---
 arch/powerpc/platforms/85xx/Kconfig |    4 ++--
 arch/powerpc/platforms/86xx/Kconfig |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/platforms/85xx/Kconfig +2 -2
index d951218..3a2ade2 100644
@@ -51,7 +51,7 @@ config MPC85xx_DS
 	bool "Freescale MPC85xx DS"
 	select PPC_I8259
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	select SWIOTLB
 	help
 	  This option enables support for the MPC85xx DS (MPC8544 DS) board
@@ -60,7 +60,7 @@ config MPC85xx_RDB
 	bool "Freescale MPC85xx RDB"
 	select PPC_I8259
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	select SWIOTLB
 	help
 	  This option enables support for the MPC85xx RDB (P2020 RDB) board
arch/powerpc/platforms/86xx/Kconfig +2 -2
index fbe9f36..a0b5638 100644
@@ -13,7 +13,7 @@ config MPC8641_HPCN
 	bool "Freescale MPC8641 HPCN"
 	select PPC_I8259
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	select HAS_RAPIDIO
 	select SWIOTLB
 	help
@@ -28,7 +28,7 @@ config SBC8641D
 config MPC8610_HPCD
 	bool "Freescale MPC8610 HPCD"
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	help
 	  This option enables support for the MPC8610 HPCD board.
 
Signature · 1 line
1.7.0.3
Applied
#1 lore raw
Quoted 4 lines · Anton Vorontsov

Currently some MPC85xx and MPC86xx boards fail to build without CONFIG_PCI:
=20
arch/powerpc/platforms/fsl_uli1575.c: In function =

'quirk_final_uli5249':

Quoted 1 line

arch/powerpc/platforms/fsl_uli1575.c:234: error: implicit declaration =

of function 'pci_bus_for_each_resource'

Quoted 1 line

arch/powerpc/platforms/fsl_uli1575.c:234: error: expected ';' before =

'{' token

Quoted 2 lines

cc1: warnings being treated as errors arch/powerpc/platforms/fsl_uli1575.c:223: warning: unused variable =

'dummy'

Quoted 10 lines

make[1]: *** [arch/powerpc/platforms/fsl_uli1575.o] Error 1 =20
This patch fixes the issue by appending 'if PCI' condition when selecting FSL_ULI1575 Kconfig symbol.
=20

---

arch/powerpc/platforms/85xx/Kconfig |    4 ++--
arch/powerpc/platforms/86xx/Kconfig |    4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

applied to merge.

- k=