Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c03a9278 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: move CONFIG_IDE_ETRAX to drivers/ide/Kconfig 



* Move ETRAX_IDE and friends from arch/cris/arch-{v10,v32}/drivers/Kconfig
  to drivers/ide/Kconfig.

* Don't force selecting ide-disk and ide-cd device drivers
  (please handle this through defconfig if necessary).

* Make ETRAX_IDE depend on BROKEN for the time being
  (it doesn't even compile currently).

Cc: Mikael Starvik <starvik@axis.com>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent acfad6e1

arch/cris/arch-v10/drivers/Kconfig

+0 −39
Original line number Diff line number Diff line
@@ -542,45 +542,6 @@ config ETRAX_RS485_DISABLE_RECEIVER 
	  loopback.  Not all products are able to do this in software only.

	  Axis 2400/2401 must disable receiver.



config ETRAX_IDE

	bool "ATA/IDE support"

	select IDE

	select BLK_DEV_IDE

	select BLK_DEV_IDEDISK

	select BLK_DEV_IDECD

	select BLK_DEV_IDEDMA

	select IDE_GENERIC

	help

	  Enable this to get support for ATA/IDE.

	  You can't use parallel ports or SCSI ports

	  at the same time.





config ETRAX_IDE_DELAY

	int "Delay for drives to regain consciousness"

	depends on ETRAX_IDE

	default 15

	help

	  Number of seconds to wait for IDE drives to spin up after an IDE

	  reset.

choice

	prompt "IDE reset pin"

	depends on ETRAX_IDE

	default ETRAX_IDE_PB7_RESET



config ETRAX_IDE_PB7_RESET

	bool "Port_PB_Bit_7"

	help

	  IDE reset on pin 7 on port B



config ETRAX_IDE_G27_RESET

	bool "Port_G_Bit_27"

	help

	  IDE reset on pin 27 on port G



endchoice





config ETRAX_USB_HOST

	bool "USB host"

	select USB

arch/cris/arch-v32/drivers/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -582,18 +582,6 @@ config ETRAX_PE_CHANGEABLE_BITS 
	  that a user can change the value on using ioctl's.

	  Bit set = changeable.



config ETRAX_IDE

	bool "ATA/IDE support"

	depends on ETRAX_ARCH_V32

	select IDE

	select BLK_DEV_IDE

	select BLK_DEV_IDEDISK

	select BLK_DEV_IDECD

	select BLK_DEV_IDEDMA

	select IDE_GENERIC

	help

	  Enables the ETRAX IDE driver.



config ETRAX_CARDBUS

        bool "Cardbus support"

        depends on ETRAX_ARCH_V32

drivers/ide/Kconfig

+35 −0
Original line number Diff line number Diff line
@@ -882,6 +882,41 @@ config BLK_DEV_IDE_BAST 
	  Say Y here if you want to support the onboard IDE channels on the

	  Simtec BAST or the Thorcom VR1000



config ETRAX_IDE

	bool "ETRAX IDE support"

	depends on CRIS && BROKEN

	select BLK_DEV_IDEDMA

	select IDE_GENERIC

	help

	  Enables the ETRAX IDE driver.



	  You can't use parallel ports or SCSI ports at the same time.



config ETRAX_IDE_DELAY

	int "Delay for drives to regain consciousness"

	depends on ETRAX_IDE && ETRAX_ARCH_V10

	default 15

	help

	  Number of seconds to wait for IDE drives to spin up after an IDE

	  reset.



choice

	prompt "IDE reset pin"

	depends on ETRAX_IDE && ETRAX_ARCH_V10

	default ETRAX_IDE_PB7_RESET



config ETRAX_IDE_PB7_RESET

	bool "Port_PB_Bit_7"

	help

	  IDE reset on pin 7 on port B



config ETRAX_IDE_G27_RESET

	bool "Port_G_Bit_27"

	help

	  IDE reset on pin 27 on port G



endchoice



config IDE_H8300

	bool "H8300 IDE support"

	depends on H8300