Mass storage device config re-org

PATCH New Brad Hards 1 participant 1 message Jul 18, 2002

Subsystems (9)

Arm (32-bit) Block layer MIPS SuperH +5 more subsystems

lore

Share & tools

lore

Brad Hards

author

2002-07-18 22:24 UTC #0 lore raw

PATCH 1/1 Mass storage device config re-org

I'm looking at usability cleanups on the configuration files ([Cc]onfig.in).

The main concepts are to keep related menu entries together without excessive resort to 'misc" and "general", and to keep xconfig and menuconfig entries to about a screenful. Those two concepts are sometimes contradictory....

The current focus is on the various mass storage drivers. I plan to group them all under a single menu entry (done for i386, easily extensible to other arch, except for sparc of course). The main changes are pulling the parallel port IDE stuff out of the rest of block to a separate menu item, pulling QIC02 and ftape out of the rest of char(!) and some changes to the way IDE configuration works. I got a response from Martin Dalecki (to an RFC patch to lkml) that the IDE changes looked OK.

I'll work the other arch's when this bit is in.

Please apply.

Brad

Signature · 1 line

http://conf.linux.org.au. 22-25Jan2003. Perth, Australia. Birds in Black.

arch/alpha/config.in +4 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/alpha/config.in linux-2.5.26-confighacking/arch/alpha/config.in
@@ -276,6 +276,8 @@
 
 source drivers/block/Config.in
 
+source drivers/block/Config-paride.in
+
 source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then

@@ -285,13 +287,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+source drivers/ide/Config.in
 
-if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
-else
-  define_bool CONFIG_BLK_DEV_HD n
-fi
 endmenu
 
 mainmenu_option next_comment

@@ -336,6 +333,7 @@
 endmenu
 
 source drivers/char/Config.in
+source drivers/char/Config-tape.in
 
 #source drivers/misc/Config.in

arch/arm/config.in +3 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/arm/config.in linux-2.5.26-confighacking/arch/arm/config.in
@@ -505,6 +505,7 @@
 
 source drivers/pnp/Config.in
 source drivers/block/Config.in
+source drivers/block/Config-paride.in
 source drivers/md/Config.in
 
 if [ "$CONFIG_ARCH_ACORN" = "y" ]; then

@@ -531,13 +532,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+source drivers/ide/Config.in
 
-if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
-else
-  define_bool CONFIG_BLK_DEV_HD n
-fi
 endmenu
 
 mainmenu_option next_comment

@@ -574,6 +570,7 @@
       define_bool CONFIG_RPCMOUSE y
    fi
 fi
+source drivers/char/Config-tape.in
 
 source drivers/media/Config.in

arch/cris/config.in +4 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/cris/config.in linux-2.5.26-confighacking/arch/cris/config.in
@@ -133,6 +133,8 @@
 
 source drivers/block/Config.in
 
+source drivers/block/Config-paride.in
+
 source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then

@@ -144,13 +146,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+source drivers/ide/Config.in
 
-if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
-else
-  define_bool CONFIG_BLK_DEV_HD n
-fi
 endmenu
 
 mainmenu_option next_comment

@@ -201,6 +198,7 @@
 #
 source drivers/input/Config.in
 source drivers/char/Config.in
+source drivers/char/Config-tape.in
 
 #source drivers/misc/Config.in

arch/i386/config.in +28 ~~-29~~

82 lines not on this page · raw message

arch/ia64/config.in +3 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/ia64/config.in linux-2.5.26-confighacking/arch/ia64/config.in
@@ -127,6 +127,7 @@
 source drivers/mtd/Config.in
 source drivers/pnp/Config.in
 source drivers/block/Config.in
+source drivers/block/Config-paride.in
 source drivers/ieee1394/Config.in
 source drivers/message/i2o/Config.in
 source drivers/md/Config.in

@@ -135,13 +136,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+source drivers/ide/Config.in
 
-if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
-else
-  define_bool CONFIG_BLK_DEV_HD n
-fi
 endmenu
 
 else # ! HP_SIM

@@ -200,6 +196,7 @@
 #
 source drivers/input/Config.in
 source drivers/char/Config.in
+source drivers/char/Config-tape.in
 
 #source drivers/misc/Config.in

arch/m68k/config.in +3 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/m68k/config.in linux-2.5.26-confighacking/arch/m68k/config.in
@@ -149,6 +149,8 @@
 
 source drivers/block/Config.in
 
+source drivers/block/Config-paride.in
+
 source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then

@@ -162,13 +164,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+source drivers/ide/Config.in
 
-if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
-else
-  define_bool CONFIG_BLK_DEV_HD n
-fi
 endmenu
 
 mainmenu_option next_comment

arch/mips/config.in +5 -7

diff -Naur -X dontdiff linux-2.5.26-clean/arch/mips/config.in linux-2.5.26-confighacking/arch/mips/config.in
@@ -331,6 +331,8 @@
 
 source drivers/block/Config.in
 
+source drivers/block/Config-paride.in
+
 source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then

@@ -345,13 +347,8 @@
    mainmenu_option next_comment
    comment 'ATA/IDE/MFM/RLL support'
     
-   tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
-    
-   if [ "$CONFIG_IDE" != "n" ]; then
-      source drivers/ide/Config.in
-   else
-      define_bool CONFIG_BLK_DEV_HD n
-   fi
+   source drivers/ide/Config.in
+
    endmenu
 fi

@@ -400,6 +397,7 @@
 endmenu
 
 source drivers/char/Config.in
+source drivers/char/Config-tape.in
 
 source drivers/media/Config.in

arch/mips64/config.in +4 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/mips64/config.in linux-2.5.26-confighacking/arch/mips64/config.in
@@ -129,6 +129,8 @@
 
 source drivers/block/Config.in
 
+source drivers/block/Config-paride.in
+
 source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then

@@ -140,13 +142,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+source drivers/ide/Config.in
 
-if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
-else
-  define_bool CONFIG_BLK_DEV_HD n
-fi
 endmenu
 
 mainmenu_option next_comment

@@ -191,6 +188,7 @@
 endmenu
 
 source drivers/char/Config.in
+source drivers/char/Config-tape.in
 
 #source drivers/misc/Config.in

arch/parisc/config.in +3 -0

diff -Naur -X dontdiff linux-2.5.26-clean/arch/parisc/config.in linux-2.5.26-confighacking/arch/parisc/config.in
@@ -98,6 +98,8 @@
 
 source drivers/block/Config.in
 
+source drivers/block/Config-paride.in
+
 if [ "$CONFIG_NET" = "y" ]; then
   source net/Config.in
 fi

@@ -163,6 +165,7 @@
 fi
 
 source drivers/char/Config.in
+source drivers/char/Config-tape.in
 
 source fs/Config.in

arch/ppc/config.in +5 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/ppc/config.in linux-2.5.26-confighacking/arch/ppc/config.in
@@ -413,6 +413,7 @@
 source drivers/mtd/Config.in
 source drivers/pnp/Config.in
 source drivers/block/Config.in
+source drivers/block/Config-paride.in
 source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then

@@ -422,12 +423,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
-if [ "$CONFIG_IDE" != "n" ]; then
-   source drivers/ide/Config.in
-else
-   define_bool CONFIG_BLK_DEV_HD n
-fi
+source drivers/ide/Config.in
+
 endmenu
 
 mainmenu_option next_comment

@@ -554,6 +551,8 @@
 
 source drivers/char/Config.in
 
+source drivers/char/Config-tape.in
+
 source drivers/media/Config.in
 
 source fs/Config.in

arch/ppc64/config.in +4 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/ppc64/config.in linux-2.5.26-confighacking/arch/ppc64/config.in
@@ -79,6 +79,7 @@
 source drivers/mtd/Config.in
 source drivers/pnp/Config.in
 source drivers/block/Config.in
+source drivers/block/Config-paride.in
 source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then

@@ -88,13 +89,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+source drivers/ide/Config.in
 
-if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
-else
-  define_bool CONFIG_BLK_DEV_HD n
-fi
 endmenu
 
 mainmenu_option next_comment

@@ -188,6 +184,8 @@
 
 source drivers/char/Config.in
 
+source drivers/char/Config-tape.in
+
 source drivers/media/Config.in
 
 source fs/Config.in

arch/sh/config.in +2 -0

diff -Naur -X dontdiff linux-2.5.26-clean/arch/sh/config.in linux-2.5.26-confighacking/arch/sh/config.in
@@ -204,6 +204,8 @@
 
 source drivers/block/Config.in
 
+source drivers/block/Config-paride.in
+
 source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then

arch/sparc/config.in +1 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/sparc/config.in linux-2.5.26-confighacking/arch/sparc/config.in
@@ -106,13 +106,8 @@
   mainmenu_option next_comment
   comment 'ATA/IDE/MFM/RLL support'
 
-  tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+  source drivers/ide/Config.in
 
-  if [ "$CONFIG_IDE" != "n" ]; then
-    source drivers/ide/Config.in
-  else
-    define_bool CONFIG_BLK_DEV_HD n
-  fi
   endmenu
 else
   define_bool CONFIG_IDE n

arch/sparc64/config.in +1 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/sparc64/config.in linux-2.5.26-confighacking/arch/sparc64/config.in
@@ -107,13 +107,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+source drivers/ide/Config.in
 
-if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
-else
-  define_bool CONFIG_BLK_DEV_HD n
-fi
 endmenu
 
 mainmenu_option next_comment

arch/x86_64/config.in +4 -6

diff -Naur -X dontdiff linux-2.5.26-clean/arch/x86_64/config.in linux-2.5.26-confighacking/arch/x86_64/config.in
@@ -117,6 +117,8 @@
 
 source drivers/block/Config.in
 
+source drivers/block/Config-paride.in
+
 source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then

@@ -128,13 +130,8 @@
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
-tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+source drivers/ide/Config.in
 
-if [ "$CONFIG_IDE" != "n" ]; then
-  source drivers/ide/Config.in
-else
-  define_bool CONFIG_BLK_DEV_HD n
-fi
 endmenu
 
 mainmenu_option next_comment

@@ -182,6 +179,7 @@
 #
 source drivers/input/Config.in
 source drivers/char/Config.in
+source drivers/char/Config-tape.in
 
 source drivers/misc/Config.in

drivers/block/Config-paride.in +12 -0

diff -Naur -X dontdiff linux-2.5.26-clean/drivers/block/Config-paride.in linux-2.5.26-confighacking/drivers/block/Config-paride.in
@@ -0,0 +1,12 @@
+#
+# Block device driver configuration
+#
+mainmenu_option next_comment
+comment 'Parallel Port IDE device support'
+
+dep_tristate 'Parallel port IDE device support' CONFIG_PARIDE $CONFIG_PARPORT
+if [ "$CONFIG_PARIDE" = "y" -o "$CONFIG_PARIDE" = "m" ]; then
+   source drivers/block/paride/Config.in
+fi
+
+endmenu

drivers/block/Config.in +1 -4

diff -Naur -X dontdiff linux-2.5.26-clean/drivers/block/Config.in linux-2.5.26-confighacking/drivers/block/Config.in
@@ -29,10 +29,7 @@
    fi
 fi
 dep_tristate 'XT hard disk support' CONFIG_BLK_DEV_XD $CONFIG_ISA
-dep_tristate 'Parallel port IDE device support' CONFIG_PARIDE $CONFIG_PARPORT
-if [ "$CONFIG_PARIDE" = "y" -o "$CONFIG_PARIDE" = "m" ]; then
-   source drivers/block/paride/Config.in
-fi
+
 dep_tristate 'Compaq SMART2 support' CONFIG_BLK_CPQ_DA $CONFIG_PCI
 dep_tristate 'Compaq Smart Array 5xxx support' CONFIG_BLK_CPQ_CISS_DA $CONFIG_PCI 
 dep_mbool '       SCSI tape drive support for Smart Array 5xxx' CONFIG_CISS_SCSI_TAPE $CONFIG_BLK_CPQ_CISS_DA $CONFIG_SCSI

drivers/char/Config-tape.in +24 -0

diff -Naur -X dontdiff linux-2.5.26-clean/drivers/char/Config-tape.in linux-2.5.26-confighacking/drivers/char/Config-tape.in
@@ -0,0 +1,24 @@
+#
+# Character device configuration
+#
+mainmenu_option next_comment
+comment 'Miscellaneous tape devices'
+
+tristate 'QIC-02 tape support' CONFIG_QIC02_TAPE
+if [ "$CONFIG_QIC02_TAPE" != "n" ]; then
+   bool '  Do you want runtime configuration for QIC-02' CONFIG_QIC02_DYNCONF
+   if [ "$CONFIG_QIC02_DYNCONF" != "y" ]; then
+      comment '  Edit configuration parameters in ./include/linux/tpqic02.h!'
+   else
+      comment '  Setting runtime QIC-02 configuration is done with qic02conf'
+      comment '  from the tpqic02-support package.  It is available at'
+      comment '  metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/'
+   fi
+fi
+
+tristate 'Ftape (QIC-80/Travan) support' CONFIG_FTAPE
+if [ "$CONFIG_FTAPE" != "n" ]; then
+   source drivers/char/ftape/Config.in
+fi
+endmenu
+

drivers/char/Config.in +0 ~~-20~~

diff -Naur -X dontdiff linux-2.5.26-clean/drivers/char/Config.in linux-2.5.26-confighacking/drivers/char/Config.in
@@ -117,18 +117,6 @@
    bool 'PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE
 endmenu
 
-tristate 'QIC-02 tape support' CONFIG_QIC02_TAPE
-if [ "$CONFIG_QIC02_TAPE" != "n" ]; then
-   bool '  Do you want runtime configuration for QIC-02' CONFIG_QIC02_DYNCONF
-   if [ "$CONFIG_QIC02_DYNCONF" != "y" ]; then
-      comment '  Edit configuration parameters in ./include/linux/tpqic02.h!'
-   else
-      comment '  Setting runtime QIC-02 configuration is done with qic02conf'
-      comment '  from the tpqic02-support package.  It is available at'
-      comment '  metalab.unc.edu or ftp://titus.cfw.com/pub/Linux/util/'
-   fi
-fi
-
 mainmenu_option next_comment
 comment 'Watchdog Cards'
 bool 'Watchdog Timer Support'	CONFIG_WATCHDOG

@@ -190,14 +178,6 @@
    dep_tristate 'Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)' CONFIG_SONYPI $CONFIG_PCI
 fi
 
-mainmenu_option next_comment
-comment 'Ftape, the floppy tape device driver'
-tristate 'Ftape (QIC-80/Travan) support' CONFIG_FTAPE
-if [ "$CONFIG_FTAPE" != "n" ]; then
-   source drivers/char/ftape/Config.in
-fi
-endmenu
-
 dep_tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP
 if [ "$CONFIG_AGP" != "n" ]; then
    bool '  Intel 440LX/BX/GX and I815/I820/I830M/I830MP/I840/I845/I850/I860 support' CONFIG_AGP_INTEL

drivers/ide/Config.in +2 -0

diff -Naur -X dontdiff linux-2.5.26-clean/drivers/ide/Config.in linux-2.5.26-confighacking/drivers/ide/Config.in
@@ -6,6 +6,8 @@
 mainmenu_option next_comment
 comment 'ATA and ATAPI Block devices'
 
+tristate 'ATA/IDE/MFM/RLL support' CONFIG_IDE
+
 dep_tristate 'Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy support' CONFIG_BLK_DEV_IDE $CONFIG_IDE
 comment 'Please see Documentation/ide.txt for help/info on IDE drives'
 if [ "$CONFIG_BLK_DEV_IDE" != "n" ]; then