Browse Source

ARM: limit CONFIG_HAVE_IDE to platforms that do

Support for IDE drivers should not be automatic, since most platforms
cannot actually support any IDE low-level drivers. This partly
reverts 2064c946e "ARM: always select HAVE_IDE" to set this symbol
only when either a PC-style bus (PCI, ISA, PCMCIA) is enabled or
a platform is used that is known to have an existing driver in
drivers/ide.

New platforms should not need this option and just use CONFIG_ATA
with drivers/ata/.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann 13 years ago
parent
commit
d0ee9f404f
2 changed files with 6 additions and 1 deletions
  1. 5 1
      arch/arm/Kconfig
  2. 1 0
      arch/arm/plat-omap/Kconfig

+ 5 - 1
arch/arm/Kconfig

@@ -3,7 +3,7 @@ config ARM
 	default y
 	default y
 	select HAVE_AOUT
 	select HAVE_AOUT
 	select HAVE_DMA_API_DEBUG
 	select HAVE_DMA_API_DEBUG
-	select HAVE_IDE
+	select HAVE_IDE if PCI || ISA || PCMCIA
 	select HAVE_MEMBLOCK
 	select HAVE_MEMBLOCK
 	select RTC_LIB
 	select RTC_LIB
 	select SYS_SUPPORTS_APM_EMULATION
 	select SYS_SUPPORTS_APM_EMULATION
@@ -385,6 +385,7 @@ config ARCH_FOOTBRIDGE
 	select CPU_SA110
 	select CPU_SA110
 	select FOOTBRIDGE
 	select FOOTBRIDGE
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_CLOCKEVENTS
+	select HAVE_IDE
 	help
 	help
 	  Support for systems based on the DC21285 companion chip
 	  Support for systems based on the DC21285 companion chip
 	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
 	  ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -632,6 +633,7 @@ config ARCH_PXA
 	select AUTO_ZRELADDR
 	select AUTO_ZRELADDR
 	select MULTI_IRQ_HANDLER
 	select MULTI_IRQ_HANDLER
 	select ARM_CPU_SUSPEND if PM
 	select ARM_CPU_SUSPEND if PM
+	select HAVE_IDE
 	help
 	help
 	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 
 
@@ -672,6 +674,7 @@ config ARCH_RPC
 	select NO_IOPORT
 	select NO_IOPORT
 	select ARCH_SPARSEMEM_ENABLE
 	select ARCH_SPARSEMEM_ENABLE
 	select ARCH_USES_GETTIMEOFFSET
 	select ARCH_USES_GETTIMEOFFSET
+	select HAVE_IDE
 	help
 	help
 	  On the Acorn Risc-PC, Linux can support the internal IDE disk and
 	  On the Acorn Risc-PC, Linux can support the internal IDE disk and
 	  CD-ROM interface, serial and parallel port, and the floppy drive.
 	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -690,6 +693,7 @@ config ARCH_SA1100
 	select HAVE_SCHED_CLOCK
 	select HAVE_SCHED_CLOCK
 	select TICK_ONESHOT
 	select TICK_ONESHOT
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_REQUIRE_GPIOLIB
+	select HAVE_IDE
 	help
 	help
 	  Support for StrongARM 11x0 based boards.
 	  Support for StrongARM 11x0 based boards.
 
 

+ 1 - 0
arch/arm/plat-omap/Kconfig

@@ -14,6 +14,7 @@ config ARCH_OMAP1
 	select CLKDEV_LOOKUP
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select CLKSRC_MMIO
 	select GENERIC_IRQ_CHIP
 	select GENERIC_IRQ_CHIP
+	select HAVE_IDE
 	help
 	help
 	  "Systems based on omap7xx, omap15xx or omap16xx"
 	  "Systems based on omap7xx, omap15xx or omap16xx"