summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-24 13:43:30 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-24 13:43:30 +0000
commit533879a148a3f3eb98f8ef70456b1355cf4b9469 (patch)
tree9a4f4c6648db9670806ec6b96c3ea6e3eb2addba
parent7c27f09e8de114b578fc9dc529d40689869e270b (diff)
[cosmetic] package/kernel: sort block package definitions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21133 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/block.mk250
1 files changed, 126 insertions, 124 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 53c8ab3e9..ebd5d4dde 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -7,6 +7,21 @@
BLOCK_MENU:=Block Devices
+define KernelPackage/aoe
+ SUBMENU:=$(BLOCK_MENU)
+ TITLE:=ATA over Ethernet support
+ KCONFIG:=CONFIG_ATA_OVER_ETH
+ FILES:=$(LINUX_DIR)/drivers/block/aoe/aoe.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,30,aoe)
+endef
+
+define KernelPackage/aoe/description
+ Kernel support for ATA over Ethernet
+endef
+
+$(eval $(call KernelPackage,aoe))
+
+
define KernelPackage/ata-core
SUBMENU:=$(BLOCK_MENU)
TITLE:=Serial and Parallel ATA support
@@ -39,35 +54,6 @@ endef
$(eval $(call KernelPackage,ata-ahci))
-define KernelPackage/ata-sil
-$(call AddDepends/ata,)
- TITLE:=Silicon Image SATA support
- KCONFIG:=CONFIG_SATA_SIL
- FILES:=$(LINUX_DIR)/drivers/ata/sata_sil.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,41,sata_sil,1)
-endef
-
-define KernelPackage/ata-sil/description
- Support for Silicon Image Serial ATA controllers.
-endef
-
-$(eval $(call KernelPackage,ata-sil))
-
-
-define KernelPackage/ata-sil24
-$(call AddDepends/ata,)
- TITLE:=Silicon Image 3124/3132 SATA support
- KCONFIG:=CONFIG_SATA_SIL24
- FILES:=$(LINUX_DIR)/drivers/ata/sata_sil24.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,41,sata_sil24,1)
-endef
-
-define KernelPackage/ata-sil24/description
- Support for Silicon Image 3124/3132 Serial ATA controllers.
-endef
-
-$(eval $(call KernelPackage,ata-sil24))
-
define KernelPackage/ata-artop
$(call AddDepends/ata,)
@@ -130,6 +116,36 @@ endef
$(eval $(call KernelPackage,ata-piix))
+define KernelPackage/ata-sil
+$(call AddDepends/ata,)
+ TITLE:=Silicon Image SATA support
+ KCONFIG:=CONFIG_SATA_SIL
+ FILES:=$(LINUX_DIR)/drivers/ata/sata_sil.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,41,sata_sil,1)
+endef
+
+define KernelPackage/ata-sil/description
+ Support for Silicon Image Serial ATA controllers.
+endef
+
+$(eval $(call KernelPackage,ata-sil))
+
+
+define KernelPackage/ata-sil24
+$(call AddDepends/ata,)
+ TITLE:=Silicon Image 3124/3132 SATA support
+ KCONFIG:=CONFIG_SATA_SIL24
+ FILES:=$(LINUX_DIR)/drivers/ata/sata_sil24.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,41,sata_sil24,1)
+endef
+
+define KernelPackage/ata-sil24/description
+ Support for Silicon Image 3124/3132 Serial ATA controllers.
+endef
+
+$(eval $(call KernelPackage,ata-sil24))
+
+
define KernelPackage/ata-via-sata
$(call AddDepends/ata,)
TITLE:=VIA SATA support
@@ -145,6 +161,36 @@ endef
$(eval $(call KernelPackage,ata-via-sata))
+define KernelPackage/dm
+ SUBMENU:=$(BLOCK_MENU)
+ TITLE:=Device Mapper
+ # All the "=n" are unnecessary, they're only there
+ # to stop the config from asking the question.
+ # MIRROR is M because I've needed it for pvmove.
+ KCONFIG:= \
+ CONFIG_BLK_DEV_MD=n \
+ CONFIG_DM_DEBUG=n \
+ CONFIG_DM_CRYPT=n \
+ CONFIG_DM_UEVENT=n \
+ CONFIG_DM_DELAY=n \
+ CONFIG_DM_MULTIPATH=n \
+ CONFIG_DM_ZERO=n \
+ CONFIG_DM_SNAPSHOT=n \
+ CONFIG_DM_LOG_USERSPACE=n \
+ CONFIG_MD=y \
+ CONFIG_BLK_DEV_DM \
+ CONFIG_DM_MIRROR
+ FILES:=$(LINUX_DIR)/drivers/md/dm-*.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,30,dm-mod dm-log dm-region-hash dm-mirror)
+endef
+
+define KernelPackage/dm/description
+ Kernel module necessary for LVM2 support
+endef
+
+$(eval $(call KernelPackage,dm))
+
+
define KernelPackage/ide-core
SUBMENU:=$(BLOCK_MENU)
TITLE:=IDE (ATA/ATAPI) device support
@@ -287,33 +333,26 @@ endef
$(eval $(call KernelPackage,ide-it821x))
-define KernelPackage/scsi-core
+define KernelPackage/libsas
SUBMENU:=$(BLOCK_MENU)
- TITLE:=SCSI device support
- DEPENDS:=@!TARGET_x86
- KCONFIG:= \
- CONFIG_SCSI \
- CONFIG_BLK_DEV_SD
+ TITLE:=SAS Domain Transport Attributes
+ DEPENDS:=@TARGET_x86
+ KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \
+ CONFIG_SCSI_SAS_ATTRS \
+ CONFIG_SCSI_SAS_ATA=y \
+ CONFIG_SCSI_SAS_HOST_SMP=y \
+ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
FILES:= \
- $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX)) \
- $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,20,scsi_mod,1) $(call AutoLoad,40,sd_mod,1)
+ $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas,1)
endef
-$(eval $(call KernelPackage,scsi-core))
-
-
-define KernelPackage/scsi-generic
- SUBMENU:=$(BLOCK_MENU)
- TITLE:=Kernel support for SCSI generic
- KCONFIG:= \
- CONFIG_CHR_DEV_SG
- FILES:= \
- $(LINUX_DIR)/drivers/scsi/sg.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,65,sg)
+define KernelPackage/libsas/description
+ SAS Domain Transport Attributes support.
endef
-$(eval $(call KernelPackage,scsi-generic))
+$(eval $(call KernelPackage,libsas,1))
define KernelPackage/loop
@@ -333,6 +372,26 @@ endef
$(eval $(call KernelPackage,loop))
+define KernelPackage/mvsas
+ SUBMENU:=$(BLOCK_MENU)
+ TITLE:=Marvell 88SE6440 SAS/SATA driver
+ DEPENDS:=@TARGET_x86 +kmod-libsas
+ KCONFIG:=CONFIG_SCSI_MVSAS
+ ifneq ($(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_30),)
+ FILES:=$(LINUX_DIR)/drivers/scsi/mvsas.$(LINUX_KMOD_SUFFIX)
+ else
+ FILES:=$(LINUX_DIR)/drivers/scsi/mvsas/mvsas.$(LINUX_KMOD_SUFFIX)
+ endif
+ AUTOLOAD:=$(call AutoLoad,40,mvsas,1)
+endef
+
+define KernelPackage/mvsas/description
+ Kernel support for the Marvell SAS SCSI adapters
+endef
+
+$(eval $(call KernelPackage,mvsas))
+
+
define KernelPackage/nbd
SUBMENU:=$(BLOCK_MENU)
TITLE:=Network block device support
@@ -348,87 +407,30 @@ endef
$(eval $(call KernelPackage,nbd))
-define KernelPackage/dm
+define KernelPackage/scsi-core
SUBMENU:=$(BLOCK_MENU)
- TITLE:=Device Mapper
- # All the "=n" are unnecessary, they're only there
- # to stop the config from asking the question.
- # MIRROR is M because I've needed it for pvmove.
+ TITLE:=SCSI device support
+ DEPENDS:=@!TARGET_x86
KCONFIG:= \
- CONFIG_BLK_DEV_MD=n \
- CONFIG_DM_DEBUG=n \
- CONFIG_DM_CRYPT=n \
- CONFIG_DM_UEVENT=n \
- CONFIG_DM_DELAY=n \
- CONFIG_DM_MULTIPATH=n \
- CONFIG_DM_ZERO=n \
- CONFIG_DM_SNAPSHOT=n \
- CONFIG_DM_LOG_USERSPACE=n \
- CONFIG_MD=y \
- CONFIG_BLK_DEV_DM \
- CONFIG_DM_MIRROR
- FILES:=$(LINUX_DIR)/drivers/md/dm-*.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,dm-mod dm-log dm-region-hash dm-mirror)
-endef
-
-define KernelPackage/dm/description
- Kernel module necessary for LVM2 support
-endef
-
-$(eval $(call KernelPackage,dm))
-
-
-define KernelPackage/aoe
- SUBMENU:=$(BLOCK_MENU)
- TITLE:=ATA over Ethernet support
- KCONFIG:=CONFIG_ATA_OVER_ETH
- FILES:=$(LINUX_DIR)/drivers/block/aoe/aoe.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,aoe)
-endef
-
-define KernelPackage/aoe/description
- Kernel support for ATA over Ethernet
-endef
-
-$(eval $(call KernelPackage,aoe))
-
-
-define KernelPackage/libsas
- SUBMENU:=$(BLOCK_MENU)
- TITLE:=SAS Domain Transport Attributes
- DEPENDS:=@TARGET_x86
- KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \
- CONFIG_SCSI_SAS_ATTRS \
- CONFIG_SCSI_SAS_ATA=y \
- CONFIG_SCSI_SAS_HOST_SMP=y \
- CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
+ CONFIG_SCSI \
+ CONFIG_BLK_DEV_SD
FILES:= \
- $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas,1)
+ $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX)) \
+ $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,20,scsi_mod,1) $(call AutoLoad,40,sd_mod,1)
endef
-define KernelPackage/libsas/description
- SAS Domain Transport Attributes support.
-endef
+$(eval $(call KernelPackage,scsi-core))
-$(eval $(call KernelPackage,libsas,1))
-define KernelPackage/mvsas
+define KernelPackage/scsi-generic
SUBMENU:=$(BLOCK_MENU)
- TITLE:=Marvell 88SE6440 SAS/SATA driver
- DEPENDS:=@TARGET_x86 +kmod-libsas
- KCONFIG:=CONFIG_SCSI_MVSAS
- ifneq ($(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_30),)
- FILES:=$(LINUX_DIR)/drivers/scsi/mvsas.$(LINUX_KMOD_SUFFIX)
- else
- FILES:=$(LINUX_DIR)/drivers/scsi/mvsas/mvsas.$(LINUX_KMOD_SUFFIX)
- endif
- AUTOLOAD:=$(call AutoLoad,40,mvsas,1)
-endef
-
-define KernelPackage/mvsas/description
- Kernel support for the Marvell SAS SCSI adapters
+ TITLE:=Kernel support for SCSI generic
+ KCONFIG:= \
+ CONFIG_CHR_DEV_SG
+ FILES:= \
+ $(LINUX_DIR)/drivers/scsi/sg.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,65,sg)
endef
-$(eval $(call KernelPackage,mvsas))
+$(eval $(call KernelPackage,scsi-generic))