Commit 68939121 authored by Milan Svoboda's avatar Milan Svoboda Committed by Russell King
Browse files

[ARM] 3612/1: make pci bus optional for ixp4xx platform 



Patch from Milan Svoboda

IXP4XX platform can happily live without pci bus. This patch modifies
Kconfig to support this option and modifies Makefile so pci only files
are compiled only when pci is really selected.

Patch is tested and ixdp465 runs fine with or without the pci bus.--

Signed-off-by: default avatarMilan Svoboda &lt;msvoboda@ra.rockwell.com&gt;Signed-off-by: Deepak Saxena &lt;dsaxena@plexity.net&gt;Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
parent 801194e3

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ config ISA_DMA_API 
	bool



config PCI

	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB

	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a

	  bus system, i.e. the way the CPU talks to the other stuff inside

arch/arm/mach-ixp4xx/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ config ARCH_ADI_COYOTE 


config ARCH_IXDP425

	bool "IXDP425"

	select PCI

	help

	  Say 'Y' here if you want your kernel to support Intel's 

	  IXDP425 Development Platform (Also known as Richfield).
@@ -43,7 +42,6 @@ config ARCH_IXDP425 


config MACH_IXDPG425

	bool "IXDPG425"

	select PCI

	help

	  Say 'Y' here if you want your kernel to support Intel's

	  IXDPG425 Development Platform (Also known as Montajade).
@@ -51,7 +49,6 @@ config MACH_IXDPG425 


config MACH_IXDP465

	bool "IXDP465"

	select PCI

	help

	  Say 'Y' here if you want your kernel to support Intel's

	  IXDP465 Development Platform (Also known as BMP).

arch/arm/mach-ixp4xx/Makefile

+17 −7
Original line number Diff line number Diff line
@@ -2,13 +2,23 @@ 
# Makefile for the linux kernel.

#



obj-pci-y	:=

obj-pci-n	:=



obj-pci-$(CONFIG_ARCH_IXDP4XX)		+= ixdp425-pci.o

obj-pci-$(CONFIG_MACH_IXDPG425)		+= ixdpg425-pci.o

obj-pci-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-pci.o

obj-pci-$(CONFIG_MACH_GTWX5715)		+= gtwx5715-pci.o

obj-pci-$(CONFIG_MACH_NSLU2)		+= nslu2-pci.o

obj-pci-$(CONFIG_MACH_NAS100D)		+= nas100d-pci.o



obj-y	+= common.o



obj-$(CONFIG_PCI)		+= common-pci.o

obj-$(CONFIG_ARCH_IXDP4XX)	+= ixdp425-pci.o ixdp425-setup.o

obj-$(CONFIG_MACH_IXDPG425)	+= ixdpg425-pci.o coyote-setup.o

obj-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-pci.o coyote-setup.o

obj-$(CONFIG_MACH_GTWX5715)	+= gtwx5715-pci.o gtwx5715-setup.o

obj-$(CONFIG_MACH_NSLU2)	+= nslu2-pci.o nslu2-setup.o nslu2-power.o

obj-$(CONFIG_MACH_NAS100D)	+= nas100d-pci.o nas100d-setup.o nas100d-power.o

obj-$(CONFIG_ARCH_IXDP4XX)	+= ixdp425-setup.o

obj-$(CONFIG_MACH_IXDPG425)	+= coyote-setup.o

obj-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-setup.o

obj-$(CONFIG_MACH_GTWX5715)	+= gtwx5715-setup.o

obj-$(CONFIG_MACH_NSLU2)	+= nslu2-setup.o nslu2-power.o

obj-$(CONFIG_MACH_NAS100D)	+= nas100d-setup.o nas100d-power.o



obj-$(CONFIG_PCI)		+= $(obj-pci-$(CONFIG_PCI)) common-pci.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE