ide: move CONFIG_IDE_ETRAX to drivers/ide/Kconfig

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 4 messages Nov 18, 2007 – Nov 21, 2007 libata

lore

Share & tools

lore

Bartlomiej Zolnierkiewicz

author

2007-11-18 22:36 UTC #0 lore raw

PATCH 6/21 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 <[email protected]>

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 arch/cris/arch-v10/drivers/Kconfig |   39 -------------------------------------
 arch/cris/arch-v32/drivers/Kconfig |   12 -----------
 drivers/ide/Kconfig                |   35 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 51 deletions(-)

arch/cris/arch-v10/drivers/Kconfig +0 ~~-39~~

Index: b/arch/cris/arch-v10/drivers/Kconfig
===================================================================
@@ -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~~

Index: b/arch/cris/arch-v32/drivers/Kconfig
===================================================================
@@ -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

Index: b/drivers/ide/Kconfig
===================================================================
@@ -870,6 +870,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

Sergei Shtylyov

2007-11-19 19:04 UTC #1 lore raw

Quoted 17 lines · Bartlomiej Zolnierkiewicz

* 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 <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Index: b/drivers/ide/Kconfig
===================================================================

drivers/ide/Kconfig config BLK_DEV_IDE_BAST · line 876

Quoted 7 lines

drivers/ide/Kconfig +4 -0

@@ -870,6 +870,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

Shouldn't it be the other way around, i.e. BLK_DEV_IDEDMA is enabled by
ETRAX_IDE as is the case with this option otherwise?

MBR, Sergei

Bartlomiej Zolnierkiewicz

author

2007-11-20 23:06 UTC #2 lore raw

Quoted 22 lines · Sergei Shtylyov

Quoted 20 lines · Bartlomiej Zolnierkiewicz
* 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 <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Index: b/drivers/ide/Kconfig
===================================================================
drivers/ide/Kconfig +0 -0
@@ -870,6 +870,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
 

Quoted 7 lines

drivers/ide/Kconfig config BLK_DEV_IDE_BAST · line 876
Quoted 4 lines
drivers/ide/Kconfig +4 -0
+config ETRAX_IDE
+	bool "ETRAX IDE support"
+	depends on CRIS && BROKEN
+	select BLK_DEV_IDEDMA
Shouldn't it be the other way around, i.e. BLK_DEV_IDEDMA is enabled by
ETRAX_IDE as is the case with this option otherwise?

Well, having a simple

config BLK_DEV_IDEDMA
bool

and making the other options select it seems to be a better solution.

Thanks,
Bart

Sergei Shtylyov

Acked-by

2007-11-21 11:07 UTC #3 lore raw

Quoted 28 lines · Bartlomiej Zolnierkiewicz

Quoted 20 lines
Quoted 20 lines
* 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 <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Index: b/drivers/ide/Kconfig
===================================================================
drivers/ide/Kconfig +0 -0
@@ -870,6 +870,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
 
Quoted 7 lines
drivers/ide/Kconfig config BLK_DEV_IDE_BAST · line 876
Quoted 4 lines
drivers/ide/Kconfig +4 -0
+config ETRAX_IDE
+	bool "ETRAX IDE support"
+	depends on CRIS && BROKEN
+	select BLK_DEV_IDEDMA
Shouldn't it be the other way around, i.e. BLK_DEV_IDEDMA is enabled by
ETRAX_IDE as is the case with this option otherwise?

Quoted 6 lines

Well, having a simple
config BLK_DEV_IDEDMA
bool
and making the other options select it seems to be a better solution.

Well, then

Acked-by Sergei Shtylyov <[email protected]>

MBR, Sergei