From ec7748b59e214e2c6b7d21ca5f26a760fd6e142b Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sat, 9 Feb 2008 10:46:40 +0100 Subject: ide: introduce HAVE_IDE To allow flexible configuration of IDE introduce HAVE_IDE. All archs except arm, um and s390 unconditionally select it. For arm the actual configuration determine if IDE is supported. This is a step towards introducing drivers/Kconfig for arm. Signed-off-by: Sam Ravnborg Acked-by: Russell King - ARM Linux Acked-by: Bartlomiej Zolnierkiewicz --- arch/alpha/Kconfig | 1 + arch/arm/Kconfig | 19 ++++++++++++++----- arch/avr32/Kconfig | 1 + arch/blackfin/Kconfig | 1 + arch/cris/Kconfig | 1 + arch/frv/Kconfig | 1 + arch/h8300/Kconfig | 1 + arch/ia64/Kconfig | 1 + arch/m32r/Kconfig | 1 + arch/m68k/Kconfig | 1 + arch/m68knommu/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/parisc/Kconfig | 1 + arch/powerpc/Kconfig | 1 + arch/ppc/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/sparc64/Kconfig | 1 + arch/v850/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/xtensa/Kconfig | 1 + drivers/ide/Kconfig | 6 +++++- drivers/pcmcia/Kconfig | 1 + 23 files changed, 40 insertions(+), 6 deletions(-) diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 5b7dcd5a0e75..002703b8c0b0 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig @@ -5,6 +5,7 @@ config ALPHA bool default y + select HAVE_IDE select HAVE_OPROFILE help The Alpha is a 64-bit general-purpose processor designed and diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4127af93c5f3..9619c43783ff 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -222,6 +222,7 @@ config ARCH_CLPS7500 select TIMER_ACORN select ISA select NO_IOPORT + select HAVE_IDE help Support for the Cirrus Logic PS7500FE system-on-a-chip. @@ -234,6 +235,7 @@ config ARCH_CO285 bool "Co-EBSA285" select FOOTBRIDGE select FOOTBRIDGE_ADDIN + select HAVE_IDE help Support for Intel's EBSA285 companion chip. @@ -258,6 +260,7 @@ config ARCH_EP93XX config ARCH_FOOTBRIDGE bool "FootBridge" select FOOTBRIDGE + select HAVE_IDE help Support for systems based on the DC21285 companion chip ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. @@ -296,6 +299,7 @@ config ARCH_IOP32X depends on MMU select PLAT_IOP select PCI + select HAVE_IDE help Support for Intel's 80219 and IOP32X (XScale) family of processors. @@ -305,12 +309,14 @@ config ARCH_IOP33X depends on MMU select PLAT_IOP select PCI + select HAVE_IDE help Support for Intel's IOP33X (XScale) family of processors. config ARCH_IXP23XX bool "IXP23XX-based" depends on MMU + select HAVE_IDE select PCI help Support for Intel's IXP23xx (XScale) family of processors. @@ -328,12 +334,14 @@ config ARCH_IXP4XX select GENERIC_GPIO select GENERIC_TIME select GENERIC_CLOCKEVENTS + select HAVE_IDE help Support for Intel's IXP4XX (XScale) family of processors. config ARCH_L7200 bool "LinkUp-L7200" select FIQ + select HAVE_IDE help Say Y here if you intend to run this kernel on a LinkUp Systems L7200 Software Development Board which uses an ARM720T processor. @@ -388,6 +396,7 @@ config ARCH_PXA depends on MMU select ARCH_MTD_XIP select GENERIC_GPIO + select HAVE_IDE select HAVE_GPIO_LIB select GENERIC_TIME select GENERIC_CLOCKEVENTS @@ -403,6 +412,7 @@ config ARCH_RPC select ARCH_MAY_HAVE_PC_FDC select ISA_DMA_API select NO_IOPORT + select HAVE_IDE help On the Acorn Risc-PC, Linux can support the internal IDE disk and CD-ROM interface, serial and parallel port, and the floppy drive. @@ -414,12 +424,14 @@ config ARCH_SA1100 select ARCH_MTD_XIP select GENERIC_GPIO select GENERIC_TIME + select HAVE_IDE help Support for StrongARM 11x0 based boards. config ARCH_S3C2410 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" select GENERIC_GPIO + select HAVE_IDE help Samsung S3C2410X CPU based systems, such as the Simtec Electronics BAST (), the IPAQ 1940 or @@ -427,6 +439,7 @@ config ARCH_S3C2410 config ARCH_SHARK bool "Shark" + select HAVE_IDE select ISA select ISA_DMA select PCI @@ -436,6 +449,7 @@ config ARCH_SHARK config ARCH_LH7A40X bool "Sharp LH7A40X" + select HAVE_IDE help Say Y here for systems based on one of the Sharp LH7A40X System on a Chip processors. These CPUs include an ARM922T @@ -1093,12 +1107,7 @@ source "drivers/block/Kconfig" source "drivers/misc/Kconfig" -if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \ - || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \ - || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \ - || ARCH_IXP23XX source "drivers/ide/Kconfig" -endif source "drivers/scsi/Kconfig" diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 28e0caf4156c..c75d7089f982 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -10,6 +10,7 @@ config AVR32 # With EMBEDDED=n, we get lots of stuff automatically selected # that we usually don't need on AVR32. select EMBEDDED + select HAVE_IDE select HAVE_OPROFILE select HAVE_KPROBES help diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 368bc7fe167e..589c6aca4803 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -24,6 +24,7 @@ config RWSEM_XCHGADD_ALGORITHM config BLACKFIN bool default y + select HAVE_IDE select HAVE_OPROFILE config ZONE_DMA diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 8456bc8efb7c..9389d38f222f 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -54,6 +54,7 @@ config FORCE_MAX_ZONEORDER config CRIS bool default y + select HAVE_IDE config HZ int diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 9e561ede0925..a5aac1b07562 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig @@ -5,6 +5,7 @@ config FRV bool default y + select HAVE_IDE config ZONE_DMA bool diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index f69e5ea38558..085dc6ec152b 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig @@ -8,6 +8,7 @@ mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration" config H8300 bool default y + select HAVE_IDE config MMU bool diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index b0de1132dfc0..2d4fcd01bc91 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -15,6 +15,7 @@ config IA64 select ACPI if (!IA64_HP_SIM) select PM if (!IA64_HP_SIM) select ARCH_SUPPORTS_MSI + select HAVE_IDE select HAVE_OPROFILE select HAVE_KPROBES default y diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index d4679ab55b96..de153de2ea9f 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -8,6 +8,7 @@ mainmenu "Linux/M32R Kernel Configuration" config M32R bool default y + select HAVE_IDE select HAVE_OPROFILE config SBUS diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 2b0ed89cd173..65db2261b9ea 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -5,6 +5,7 @@ config M68K bool default y + select HAVE_IDE config MMU bool diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index 548a7b321633..07eb4c4bab82 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig @@ -8,6 +8,7 @@ mainmenu "uClinux/68k (w/o MMU) Kernel Configuration" config M68K bool default y + select HAVE_IDE config MMU bool diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ec78a5762e9e..ade230d445d9 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1,6 +1,7 @@ config MIPS bool default y + select HAVE_IDE select HAVE_OPROFILE # Horrible source of confusion. Die, die, die ... select EMBEDDED diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index d929ac84f25a..bc7a19da6245 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -7,6 +7,7 @@ mainmenu "Linux/PA-RISC Kernel Configuration" config PARISC def_bool y + select HAVE_IDE select HAVE_OPROFILE help The PA-RISC microprocessor is designed by Hewlett-Packard and used diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 26b963c33c88..485513c9f1af 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -87,6 +87,7 @@ config ARCH_NO_VIRT_TO_BUS config PPC bool default y + select HAVE_IDE select HAVE_OPROFILE select HAVE_KPROBES diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 531156f8919c..abc877faf123 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -42,6 +42,7 @@ config GENERIC_CALIBRATE_DELAY config PPC bool default y + select HAVE_IDE select HAVE_OPROFILE select HAVE_KPROBES diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 6e035d1cf789..d87d4bf88803 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -8,6 +8,7 @@ mainmenu "Linux/SuperH Kernel Configuration" config SUPERH def_bool y select EMBEDDED + select HAVE_IDE select HAVE_OPROFILE help The SuperH is a RISC processor targeted for use in embedded systems diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 7c674a3503b6..c40343c54920 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -69,6 +69,7 @@ config NR_CPUS config SPARC bool default y + select HAVE_IDE select HAVE_OPROFILE # Identify this as a Sparc32 build diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index b810f2b7526a..810755637311 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig @@ -14,6 +14,7 @@ config SPARC config SPARC64 bool default y + select HAVE_IDE help SPARC is a family of RISC microprocessors designed and marketed by Sun Microsystems, incorporated. This port covers the newer 64-bit diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig index 7b6d3716efca..4379f43505ef 100644 --- a/arch/v850/Kconfig +++ b/arch/v850/Kconfig @@ -78,6 +78,7 @@ config MCA config V850 bool default y + select HAVE_IDE menu "Processor type and features" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 65a70b777c12..3bd42dadbc4d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -18,6 +18,7 @@ config X86_64 ### Arch settings config X86 def_bool y + select HAVE_IDE select HAVE_OPROFILE select HAVE_KPROBES diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index fd36764d7fb7..9fc8551a1cf6 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -14,6 +14,7 @@ config ZONE_DMA config XTENSA bool default y + select HAVE_IDE help Xtensa processors are 32-bit RISC machines designed by Tensilica primarily for embedded systems. These processors are both diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index ab8fb257528e..043c34ad0a05 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -4,10 +4,14 @@ # Andre Hedrick # +# Select HAVE_IDE if IDE is supported +config HAVE_IDE + def_bool n + menuconfig IDE tristate "ATA/ATAPI/MFM/RLL support" + depends on HAVE_IDE depends on BLOCK - depends on HAS_IOMEM ---help--- If you say Y here, your kernel will be able to manage low cost mass storage units such as ATA/(E)IDE and ATAPI units. The most common diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 519b4ff79f7f..8b22281b087f 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -38,6 +38,7 @@ config PCMCIA_DEBUG config PCMCIA tristate "16-bit PCMCIA support" select CRC32 + select HAVE_IDE default y ---help--- This option enables support for 16-bit PCMCIA cards. Most older -- cgit v1.2.3-58-ga151