Kaynağa Gözat

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.

Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Anton Vorontsov 15 yıl önce
ebeveyn
işleme
e0f278adc2

+ 2 - 2
arch/powerpc/platforms/85xx/Kconfig

@@ -51,7 +51,7 @@ config MPC85xx_DS
 	bool "Freescale MPC85xx DS"
 	bool "Freescale MPC85xx DS"
 	select PPC_I8259
 	select PPC_I8259
 	select DEFAULT_UIMAGE
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	select SWIOTLB
 	select SWIOTLB
 	help
 	help
 	  This option enables support for the MPC85xx DS (MPC8544 DS) board
 	  This option enables support for the MPC85xx DS (MPC8544 DS) board
@@ -60,7 +60,7 @@ config MPC85xx_RDB
 	bool "Freescale MPC85xx RDB"
 	bool "Freescale MPC85xx RDB"
 	select PPC_I8259
 	select PPC_I8259
 	select DEFAULT_UIMAGE
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	select SWIOTLB
 	select SWIOTLB
 	help
 	help
 	  This option enables support for the MPC85xx RDB (P2020 RDB) board
 	  This option enables support for the MPC85xx RDB (P2020 RDB) board

+ 2 - 2
arch/powerpc/platforms/86xx/Kconfig

@@ -13,7 +13,7 @@ config MPC8641_HPCN
 	bool "Freescale MPC8641 HPCN"
 	bool "Freescale MPC8641 HPCN"
 	select PPC_I8259
 	select PPC_I8259
 	select DEFAULT_UIMAGE
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	select HAS_RAPIDIO
 	select HAS_RAPIDIO
 	select SWIOTLB
 	select SWIOTLB
 	help
 	help
@@ -28,7 +28,7 @@ config SBC8641D
 config MPC8610_HPCD
 config MPC8610_HPCD
 	bool "Freescale MPC8610 HPCD"
 	bool "Freescale MPC8610 HPCD"
 	select DEFAULT_UIMAGE
 	select DEFAULT_UIMAGE
-	select FSL_ULI1575
+	select FSL_ULI1575 if PCI
 	help
 	help
 	  This option enables support for the MPC8610 HPCD board.
 	  This option enables support for the MPC8610 HPCD board.