Commit f7e68bbf authored by Russell King's avatar Russell King
Browse files

[PATCH] ARM: select PCI, ISA and ISA_DMA 



Rather than using a long "depends on..." and "default y" lines for
these options, use select instead.

Signed-off-by: default avatarRussell King <rmk@arm.linux.org.uk>
parent 53d7ad1e

arch/arm/Kconfig

+12 −8
Original line number Original line Diff line number Diff line
@@ -85,6 +85,7 @@ choice 
config ARCH_CLPS7500

config ARCH_CLPS7500

	bool "Cirrus-CL-PS7500FE"

	bool "Cirrus-CL-PS7500FE"

	select TIMER_ACORN

	select TIMER_ACORN

	select ISA





config ARCH_CLPS711X

config ARCH_CLPS711X

	bool "CLPS711x/EP721x-based"

	bool "CLPS711x/EP721x-based"
@@ -96,6 +97,7 @@ config ARCH_CO285 




config ARCH_EBSA110

config ARCH_EBSA110

	bool "EBSA-110"

	bool "EBSA-110"

	select ISA

	help

	help

	  This is an evaluation board for the StrongARM processor available

	  This is an evaluation board for the StrongARM processor available

	  from Digital. It has limited hardware on-board, including an onboard

	  from Digital. It has limited hardware on-board, including an onboard
@@ -120,13 +122,16 @@ config ARCH_INTEGRATOR 




config ARCH_IOP3XX

config ARCH_IOP3XX

	bool "IOP3xx-based"

	bool "IOP3xx-based"

	select PCI





config ARCH_IXP4XX

config ARCH_IXP4XX

	bool "IXP4xx-based"

	bool "IXP4xx-based"

	select DMABOUNCE

	select DMABOUNCE

	select PCI





config ARCH_IXP2000

config ARCH_IXP2000

	bool "IXP2400/2800-based"

	bool "IXP2400/2800-based"

	select PCI





config ARCH_L7200

config ARCH_L7200

	bool "LinkUp-L7200"

	bool "LinkUp-L7200"
@@ -155,6 +160,8 @@ config ARCH_RPC 




config ARCH_SA1100

config ARCH_SA1100

	bool "SA1100-based"

	bool "SA1100-based"

	select ISA

	select DISCONTIGMEM





config ARCH_S3C2410

config ARCH_S3C2410

	bool "Samsung S3C2410"

	bool "Samsung S3C2410"
@@ -165,6 +172,9 @@ config ARCH_S3C2410 




config ARCH_SHARK

config ARCH_SHARK

	bool "Shark"

	bool "Shark"

	select ISA

	select ISA_DMA

	select PCI





config ARCH_LH7A40X

config ARCH_LH7A40X

	bool "Sharp LH7A40X"

	bool "Sharp LH7A40X"
@@ -252,8 +262,6 @@ config ARM_AMBA 




config ISA

config ISA

	bool

	bool

	depends on FOOTBRIDGE_HOST || ARCH_SHARK || ARCH_CLPS7500 || ARCH_EBSA110 || ARCH_CDB89712 || ARCH_EDB7211 || ARCH_SA1100 || ARCH_MX1ADS

	default y

	help

	help

	  Find out whether you have ISA slots on your motherboard.  ISA is the

	  Find out whether you have ISA slots on your motherboard.  ISA is the

	  name of a bus system, i.e. the way the CPU talks to the other stuff

	  name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -263,8 +271,6 @@ config ISA 




config ISA_DMA

config ISA_DMA

	bool

	bool

	depends on FOOTBRIDGE_HOST || ARCH_SHARK

	default y





config ISA_DMA_API

config ISA_DMA_API

	bool

	bool
@@ -272,7 +278,6 @@ config ISA_DMA_API 




config PCI

config PCI

	bool "PCI support" if ARCH_INTEGRATOR_AP

	bool "PCI support" if ARCH_INTEGRATOR_AP

	default y if ARCH_SHARK || FOOTBRIDGE_HOST || ARCH_IOP3XX || ARCH_IXP4XX || ARCH_IXP2000

	help

	help

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

	  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

	  bus system, i.e. the way the CPU talks to the other stuff inside
@@ -300,7 +305,7 @@ menu "Kernel Features" 




config SMP

config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && n

	depends on EXPERIMENTAL #&& n

	help

	help

	  This enables support for systems with more than one CPU. If you have

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If

	  a system with only one CPU, like most personal computers, say N. If
@@ -340,8 +345,7 @@ config PREEMPT 




config DISCONTIGMEM

config DISCONTIGMEM

	bool

	bool

	depends on ARCH_EDB7211 || ARCH_SA1100 || (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)

	default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)

	default y

	help

	help

	  Say Y to support efficient handling of discontiguous physical memory,

	  Say Y to support efficient handling of discontiguous physical memory,

	  for architectures which are either NUMA (Non-Uniform Memory Access)

	  for architectures which are either NUMA (Non-Uniform Memory Access)

arch/arm/mach-clps711x/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ config ARCH_AUTCPU12 




config ARCH_CDB89712

config ARCH_CDB89712

	bool "CDB89712"

	bool "CDB89712"

	select ISA

	help

	help

	  This is an evaluation board from Cirrus for the CS89712 processor.

	  This is an evaluation board from Cirrus for the CS89712 processor.

	  The board includes 2 serial ports, Ethernet, IRDA, and expansion

	  The board includes 2 serial ports, Ethernet, IRDA, and expansion
@@ -26,6 +27,8 @@ config ARCH_CLEP7312 




config ARCH_EDB7211

config ARCH_EDB7211

	bool "EDB7211"

	bool "EDB7211"

	select ISA

	select DISCONTIGMEM

	help

	help

	  Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211

	  Say Y here if you intend to run this kernel on a Cirrus Logic EDB-7211

	  evaluation board.

	  evaluation board.

arch/arm/mach-footbridge/Kconfig

+12 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,9 @@ menu "Footbridge Implementations" 
config ARCH_CATS

config ARCH_CATS

	bool "CATS"

	bool "CATS"

	select FOOTBRIDGE_HOST

	select FOOTBRIDGE_HOST

	select ISA

	select ISA_DMA

	select PCI

	help

	help

	  Say Y here if you intend to run this kernel on the CATS.

	  Say Y here if you intend to run this kernel on the CATS.
@@ -13,6 +16,9 @@ config ARCH_CATS 
config ARCH_PERSONAL_SERVER

config ARCH_PERSONAL_SERVER

	bool "Compaq Personal Server"

	bool "Compaq Personal Server"

	select FOOTBRIDGE_HOST

	select FOOTBRIDGE_HOST

	select ISA

	select ISA_DMA

	select PCI

	---help---

	---help---

	  Say Y here if you intend to run this kernel on the Compaq

	  Say Y here if you intend to run this kernel on the Compaq

	  Personal Server.

	  Personal Server.
@@ -42,6 +48,9 @@ config ARCH_EBSA285_HOST 
	bool "EBSA285 (host mode)"

	bool "EBSA285 (host mode)"

	select ARCH_EBSA285

	select ARCH_EBSA285

	select FOOTBRIDGE_HOST

	select FOOTBRIDGE_HOST

	select ISA

	select ISA_DMA

	select PCI

	help

	help

	  Say Y here if you intend to run this kernel on the EBSA285 card

	  Say Y here if you intend to run this kernel on the EBSA285 card

	  in host ("central function") mode.

	  in host ("central function") mode.
@@ -51,6 +60,9 @@ config ARCH_EBSA285_HOST 
config ARCH_NETWINDER

config ARCH_NETWINDER

	bool "NetWinder"

	bool "NetWinder"

	select FOOTBRIDGE_HOST

	select FOOTBRIDGE_HOST

	select ISA

	select ISA_DMA

	select PCI

	help

	help

	  Say Y here if you intend to run this kernel on the Rebel.COM

	  Say Y here if you intend to run this kernel on the Rebel.COM

	  NetWinder.  Information about this machine can be found at:

	  NetWinder.  Information about this machine can be found at:

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ menu "IMX Implementations" 
config ARCH_MX1ADS

config ARCH_MX1ADS

	bool "mx1ads"

	bool "mx1ads"

	depends on ARCH_IMX

	depends on ARCH_IMX

	select ISA

	help

	help

	  Say Y here if you are using the Motorola MX1ADS board

	  Say Y here if you are using the Motorola MX1ADS board