aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-02-09 04:46:40 -0500
committerSam Ravnborg <sam@ravnborg.org>2008-02-09 04:46:40 -0500
commitec7748b59e214e2c6b7d21ca5f26a760fd6e142b (patch)
tree155d6d9f418b4baac9bee0cc4f6a70ab080ba183
parentd75f4c683f817ef61c9ae634886e7ebc3133c002 (diff)
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 <sam@ravnborg.org> Acked-by: Russell King - ARM Linux <linux@arm.linux.org.uk> Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat
-rw-r--r--arch/alpha/Kconfig1
-rw-r--r--arch/arm/Kconfig19
-rw-r--r--arch/avr32/Kconfig1
-rw-r--r--arch/blackfin/Kconfig1
-rw-r--r--arch/cris/Kconfig1
-rw-r--r--arch/frv/Kconfig1
-rw-r--r--arch/h8300/Kconfig1
-rw-r--r--arch/ia64/Kconfig1
-rw-r--r--arch/m32r/Kconfig1
-rw-r--r--arch/m68k/Kconfig1
-rw-r--r--arch/m68knommu/Kconfig1
-rw-r--r--arch/mips/Kconfig1
-rw-r--r--arch/parisc/Kconfig1
-rw-r--r--arch/powerpc/Kconfig1
-rw-r--r--arch/ppc/Kconfig1
-rw-r--r--arch/sh/Kconfig1
-rw-r--r--arch/sparc/Kconfig1
-rw-r--r--arch/sparc64/Kconfig1
-rw-r--r--arch/v850/Kconfig1
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--arch/xtensa/Kconfig1
-rw-r--r--drivers/ide/Kconfig6
-rw-r--r--drivers/pcmcia/Kconfig1
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 @@
5config ALPHA 5config ALPHA
6 bool 6 bool
7 default y 7 default y
8 select HAVE_IDE
8 select HAVE_OPROFILE 9 select HAVE_OPROFILE
9 help 10 help
10 The Alpha is a 64-bit general-purpose processor designed and 11 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
222 select TIMER_ACORN 222 select TIMER_ACORN
223 select ISA 223 select ISA
224 select NO_IOPORT 224 select NO_IOPORT
225 select HAVE_IDE
225 help 226 help
226 Support for the Cirrus Logic PS7500FE system-on-a-chip. 227 Support for the Cirrus Logic PS7500FE system-on-a-chip.
227 228
@@ -234,6 +235,7 @@ config ARCH_CO285
234 bool "Co-EBSA285" 235 bool "Co-EBSA285"
235 select FOOTBRIDGE 236 select FOOTBRIDGE
236 select FOOTBRIDGE_ADDIN 237 select FOOTBRIDGE_ADDIN
238 select HAVE_IDE
237 help 239 help
238 Support for Intel's EBSA285 companion chip. 240 Support for Intel's EBSA285 companion chip.
239 241
@@ -258,6 +260,7 @@ config ARCH_EP93XX
258config ARCH_FOOTBRIDGE 260config ARCH_FOOTBRIDGE
259 bool "FootBridge" 261 bool "FootBridge"
260 select FOOTBRIDGE 262 select FOOTBRIDGE
263 select HAVE_IDE
261 help 264 help
262 Support for systems based on the DC21285 companion chip 265 Support for systems based on the DC21285 companion chip
263 ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. 266 ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -296,6 +299,7 @@ config ARCH_IOP32X
296 depends on MMU 299 depends on MMU
297 select PLAT_IOP 300 select PLAT_IOP
298 select PCI 301 select PCI
302 select HAVE_IDE
299 help 303 help
300 Support for Intel's 80219 and IOP32X (XScale) family of 304 Support for Intel's 80219 and IOP32X (XScale) family of
301 processors. 305 processors.
@@ -305,12 +309,14 @@ config ARCH_IOP33X
305 depends on MMU 309 depends on MMU
306 select PLAT_IOP 310 select PLAT_IOP
307 select PCI 311 select PCI
312 select HAVE_IDE
308 help 313 help
309 Support for Intel's IOP33X (XScale) family of processors. 314 Support for Intel's IOP33X (XScale) family of processors.
310 315
311config ARCH_IXP23XX 316config ARCH_IXP23XX
312 bool "IXP23XX-based" 317 bool "IXP23XX-based"
313 depends on MMU 318 depends on MMU
319 select HAVE_IDE
314 select PCI 320 select PCI
315 help 321 help
316 Support for Intel's IXP23xx (XScale) family of processors. 322 Support for Intel's IXP23xx (XScale) family of processors.
@@ -328,12 +334,14 @@ config ARCH_IXP4XX
328 select GENERIC_GPIO 334 select GENERIC_GPIO
329 select GENERIC_TIME 335 select GENERIC_TIME
330 select GENERIC_CLOCKEVENTS 336 select GENERIC_CLOCKEVENTS
337 select HAVE_IDE
331 help 338 help
332 Support for Intel's IXP4XX (XScale) family of processors. 339 Support for Intel's IXP4XX (XScale) family of processors.
333 340
334config ARCH_L7200 341config ARCH_L7200
335 bool "LinkUp-L7200" 342 bool "LinkUp-L7200"
336 select FIQ 343 select FIQ
344 select HAVE_IDE
337 help 345 help
338 Say Y here if you intend to run this kernel on a LinkUp Systems 346 Say Y here if you intend to run this kernel on a LinkUp Systems
339 L7200 Software Development Board which uses an ARM720T processor. 347 L7200 Software Development Board which uses an ARM720T processor.
@@ -388,6 +396,7 @@ config ARCH_PXA
388 depends on MMU 396 depends on MMU
389 select ARCH_MTD_XIP 397 select ARCH_MTD_XIP
390 select GENERIC_GPIO 398 select GENERIC_GPIO
399 select HAVE_IDE
391 select HAVE_GPIO_LIB 400 select HAVE_GPIO_LIB
392 select GENERIC_TIME 401 select GENERIC_TIME
393 select GENERIC_CLOCKEVENTS 402 select GENERIC_CLOCKEVENTS
@@ -403,6 +412,7 @@ config ARCH_RPC
403 select ARCH_MAY_HAVE_PC_FDC 412 select ARCH_MAY_HAVE_PC_FDC
404 select ISA_DMA_API 413 select ISA_DMA_API
405 select NO_IOPORT 414 select NO_IOPORT
415 select HAVE_IDE
406 help 416 help
407 On the Acorn Risc-PC, Linux can support the internal IDE disk and 417 On the Acorn Risc-PC, Linux can support the internal IDE disk and
408 CD-ROM interface, serial and parallel port, and the floppy drive. 418 CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -414,12 +424,14 @@ config ARCH_SA1100
414 select ARCH_MTD_XIP 424 select ARCH_MTD_XIP
415 select GENERIC_GPIO 425 select GENERIC_GPIO
416 select GENERIC_TIME 426 select GENERIC_TIME
427 select HAVE_IDE
417 help 428 help
418 Support for StrongARM 11x0 based boards. 429 Support for StrongARM 11x0 based boards.
419 430
420config ARCH_S3C2410 431config ARCH_S3C2410
421 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" 432 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
422 select GENERIC_GPIO 433 select GENERIC_GPIO
434 select HAVE_IDE
423 help 435 help
424 Samsung S3C2410X CPU based systems, such as the Simtec Electronics 436 Samsung S3C2410X CPU based systems, such as the Simtec Electronics
425 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or 437 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -427,6 +439,7 @@ config ARCH_S3C2410
427 439
428config ARCH_SHARK 440config ARCH_SHARK
429 bool "Shark" 441 bool "Shark"
442 select HAVE_IDE
430 select ISA 443 select ISA
431 select ISA_DMA 444 select ISA_DMA
432 select PCI 445 select PCI
@@ -436,6 +449,7 @@ config ARCH_SHARK
436 449
437config ARCH_LH7A40X 450config ARCH_LH7A40X
438 bool "Sharp LH7A40X" 451 bool "Sharp LH7A40X"
452 select HAVE_IDE
439 help 453 help
440 Say Y here for systems based on one of the Sharp LH7A40X 454 Say Y here for systems based on one of the Sharp LH7A40X
441 System on a Chip processors. These CPUs include an ARM922T 455 System on a Chip processors. These CPUs include an ARM922T
@@ -1093,12 +1107,7 @@ source "drivers/block/Kconfig"
1093 1107
1094source "drivers/misc/Kconfig" 1108source "drivers/misc/Kconfig"
1095 1109
1096if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \
1097 || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
1098 || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
1099 || ARCH_IXP23XX
1100source "drivers/ide/Kconfig" 1110source "drivers/ide/Kconfig"
1101endif
1102 1111
1103source "drivers/scsi/Kconfig" 1112source "drivers/scsi/Kconfig"
1104 1113
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
10 # With EMBEDDED=n, we get lots of stuff automatically selected 10 # With EMBEDDED=n, we get lots of stuff automatically selected
11 # that we usually don't need on AVR32. 11 # that we usually don't need on AVR32.
12 select EMBEDDED 12 select EMBEDDED
13 select HAVE_IDE
13 select HAVE_OPROFILE 14 select HAVE_OPROFILE
14 select HAVE_KPROBES 15 select HAVE_KPROBES
15 help 16 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
24config BLACKFIN 24config BLACKFIN
25 bool 25 bool
26 default y 26 default y
27 select HAVE_IDE
27 select HAVE_OPROFILE 28 select HAVE_OPROFILE
28 29
29config ZONE_DMA 30config 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
54config CRIS 54config CRIS
55 bool 55 bool
56 default y 56 default y
57 select HAVE_IDE
57 58
58config HZ 59config HZ
59 int 60 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 @@
5config FRV 5config FRV
6 bool 6 bool
7 default y 7 default y
8 select HAVE_IDE
8 9
9config ZONE_DMA 10config ZONE_DMA
10 bool 11 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"
8config H8300 8config H8300
9 bool 9 bool
10 default y 10 default y
11 select HAVE_IDE
11 12
12config MMU 13config MMU
13 bool 14 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
15 select ACPI if (!IA64_HP_SIM) 15 select ACPI if (!IA64_HP_SIM)
16 select PM if (!IA64_HP_SIM) 16 select PM if (!IA64_HP_SIM)
17 select ARCH_SUPPORTS_MSI 17 select ARCH_SUPPORTS_MSI
18 select HAVE_IDE
18 select HAVE_OPROFILE 19 select HAVE_OPROFILE
19 select HAVE_KPROBES 20 select HAVE_KPROBES
20 default y 21 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"
8config M32R 8config M32R
9 bool 9 bool
10 default y 10 default y
11 select HAVE_IDE
11 select HAVE_OPROFILE 12 select HAVE_OPROFILE
12 13
13config SBUS 14config 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 @@
5config M68K 5config M68K
6 bool 6 bool
7 default y 7 default y
8 select HAVE_IDE
8 9
9config MMU 10config MMU
10 bool 11 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"
8config M68K 8config M68K
9 bool 9 bool
10 default y 10 default y
11 select HAVE_IDE
11 12
12config MMU 13config MMU
13 bool 14 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 @@
1config MIPS 1config MIPS
2 bool 2 bool
3 default y 3 default y
4 select HAVE_IDE
4 select HAVE_OPROFILE 5 select HAVE_OPROFILE
5 # Horrible source of confusion. Die, die, die ... 6 # Horrible source of confusion. Die, die, die ...
6 select EMBEDDED 7 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"
7 7
8config PARISC 8config PARISC
9 def_bool y 9 def_bool y
10 select HAVE_IDE
10 select HAVE_OPROFILE 11 select HAVE_OPROFILE
11 help 12 help
12 The PA-RISC microprocessor is designed by Hewlett-Packard and used 13 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
87config PPC 87config PPC
88 bool 88 bool
89 default y 89 default y
90 select HAVE_IDE
90 select HAVE_OPROFILE 91 select HAVE_OPROFILE
91 select HAVE_KPROBES 92 select HAVE_KPROBES
92 93
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
42config PPC 42config PPC
43 bool 43 bool
44 default y 44 default y
45 select HAVE_IDE
45 select HAVE_OPROFILE 46 select HAVE_OPROFILE
46 select HAVE_KPROBES 47 select HAVE_KPROBES
47 48
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"
8config SUPERH 8config SUPERH
9 def_bool y 9 def_bool y
10 select EMBEDDED 10 select EMBEDDED
11 select HAVE_IDE
11 select HAVE_OPROFILE 12 select HAVE_OPROFILE
12 help 13 help
13 The SuperH is a RISC processor targeted for use in embedded systems 14 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
69config SPARC 69config SPARC
70 bool 70 bool
71 default y 71 default y
72 select HAVE_IDE
72 select HAVE_OPROFILE 73 select HAVE_OPROFILE
73 74
74# Identify this as a Sparc32 build 75# 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
14config SPARC64 14config SPARC64
15 bool 15 bool
16 default y 16 default y
17 select HAVE_IDE
17 help 18 help
18 SPARC is a family of RISC microprocessors designed and marketed by 19 SPARC is a family of RISC microprocessors designed and marketed by
19 Sun Microsystems, incorporated. This port covers the newer 64-bit 20 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
78config V850 78config V850
79 bool 79 bool
80 default y 80 default y
81 select HAVE_IDE
81 82
82menu "Processor type and features" 83menu "Processor type and features"
83 84
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
18### Arch settings 18### Arch settings
19config X86 19config X86
20 def_bool y 20 def_bool y
21 select HAVE_IDE
21 select HAVE_OPROFILE 22 select HAVE_OPROFILE
22 select HAVE_KPROBES 23 select HAVE_KPROBES
23 24
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
14config XTENSA 14config XTENSA
15 bool 15 bool
16 default y 16 default y
17 select HAVE_IDE
17 help 18 help
18 Xtensa processors are 32-bit RISC machines designed by Tensilica 19 Xtensa processors are 32-bit RISC machines designed by Tensilica
19 primarily for embedded systems. These processors are both 20 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 @@
4# Andre Hedrick <andre@linux-ide.org> 4# Andre Hedrick <andre@linux-ide.org>
5# 5#
6 6
7# Select HAVE_IDE if IDE is supported
8config HAVE_IDE
9 def_bool n
10
7menuconfig IDE 11menuconfig IDE
8 tristate "ATA/ATAPI/MFM/RLL support" 12 tristate "ATA/ATAPI/MFM/RLL support"
13 depends on HAVE_IDE
9 depends on BLOCK 14 depends on BLOCK
10 depends on HAS_IOMEM
11 ---help--- 15 ---help---
12 If you say Y here, your kernel will be able to manage low cost mass 16 If you say Y here, your kernel will be able to manage low cost mass
13 storage units such as ATA/(E)IDE and ATAPI units. The most common 17 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
38config PCMCIA 38config PCMCIA
39 tristate "16-bit PCMCIA support" 39 tristate "16-bit PCMCIA support"
40 select CRC32 40 select CRC32
41 select HAVE_IDE
41 default y 42 default y
42 ---help--- 43 ---help---
43 This option enables support for 16-bit PCMCIA cards. Most older 44 This option enables support for 16-bit PCMCIA cards. Most older
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-28 09:27:22 -0400