X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fblock.mk;h=8a4c68a8826a9b30ab22ca6a7379521e222a1628;hb=dd595a0584a23623900777116cc71de88ca71ed2;hp=53c8ab3e99d89375b9f889c2d163370764e50053;hpb=7c27f09e8de114b578fc9dc529d40689869e270b;p=openwrt.git

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 53c8ab3e99..8a4c68a882 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -7,6 +7,22 @@
 
 BLOCK_MENU:=Block Devices
 
+define KernelPackage/aoe
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=ATA over Ethernet support
+  DEPENDS:=@LINUX_2_6
+  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
@@ -26,11 +42,11 @@ endef
 
 
 define KernelPackage/ata-ahci
-$(call AddDepends/ata)
   TITLE:=AHCI Serial ATA support
   KCONFIG:=CONFIG_SATA_AHCI
   FILES:=$(LINUX_DIR)/drivers/ata/ahci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,ahci,1)
+  $(call AddDepends/ata)
 endef
 
 define KernelPackage/ata-ahci/description
@@ -39,42 +55,13 @@ 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,)
   TITLE:=ARTOP 6210/6260 PATA support
   KCONFIG:=CONFIG_PATA_ARTOP
   FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,pata_artop,1)
+  $(call AddDepends/ata)
 endef
 
 define KernelPackage/ata-artop/description
@@ -85,11 +72,11 @@ $(eval $(call KernelPackage,ata-artop))
 
 
 define KernelPackage/ata-nvidia-sata
-$(call AddDepends/ata,)
   TITLE:=Nvidia Serial ATA support
   KCONFIG:=CONFIG_SATA_NV
   FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,sata_nv,1)
+  $(call AddDepends/ata)
 endef
 
 $(eval $(call KernelPackage,ata-nvidia-sata))
@@ -115,11 +102,11 @@ $(eval $(call KernelPackage,ata-pdc202xx-old))
 
 
 define KernelPackage/ata-piix
-$(call AddDepends/ata,)
   TITLE:=Intel PIIX PATA/SATA support
   KCONFIG:=CONFIG_ATA_PIIX
   FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,ata_piix,1)
+  $(call AddDepends/ata)
 endef
 
 define KernelPackage/ata-piix/description
@@ -130,12 +117,42 @@ endef
 $(eval $(call KernelPackage,ata-piix))
 
 
+define KernelPackage/ata-sil
+  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)
+  $(call AddDepends/ata)
+endef
+
+define KernelPackage/ata-sil/description
+ Support for Silicon Image Serial ATA controllers.
+endef
+
+$(eval $(call KernelPackage,ata-sil))
+
+
+define KernelPackage/ata-sil24
+  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)
+  $(call AddDepends/ata)
+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
   KCONFIG:=CONFIG_SATA_VIA
   FILES:=$(LINUX_DIR)/drivers/ata/sata_via.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,sata_via,1)
+  $(call AddDepends/ata)
 endef
 
 define KernelPackage/ata-via-sata/description
@@ -145,6 +162,48 @@ endef
 $(eval $(call KernelPackage,ata-via-sata))
 
 
+define KernelPackage/block2mtd
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Block device MTD emulation
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_MTD_BLOCK2MTD
+  FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.$(LINUX_KMOD_SUFFIX)
+endef
+
+$(eval $(call KernelPackage,block2mtd))
+
+
+define KernelPackage/dm
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Device Mapper
+  DEPENDS:=@LINUX_2_6
+  # 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
@@ -193,15 +252,16 @@ $(eval $(call KernelPackage,ide-core))
 
 define AddDepends/ide
   SUBMENU:=$(BLOCK_MENU)
-  DEPENDS:=kmod-ide-core $(1)
+  DEPENDS+=kmod-ide-core $(1)
 endef
 
 
 define KernelPackage/ide-generic
-$(call AddDepends/ide,@PCI_SUPPORT)
   SUBMENU:=$(BLOCK_MENU)
+  DEPENDS:=@PCI_SUPPORT
   TITLE:=Kernel support for generic PCI IDE chipsets
   KCONFIG:=CONFIG_BLK_DEV_GENERIC
+  $(call AddDepends/ide)
 endef
 
 define KernelPackage/ide-generic/2.4
@@ -222,23 +282,25 @@ $(eval $(call KernelPackage,ide-generic))
 
 
 define KernelPackage/ide-generic-old
-$(call AddDepends/ide,@LINUX_2_6)
   SUBMENU:=$(BLOCK_MENU)
+  DEPENDS:=@LINUX_2_6
   TITLE:=Kernel support for generic (legacy) IDE chipsets
   KCONFIG:=CONFIG_IDE_GENERIC
   FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,ide-generic,1)
+  $(call AddDepends/ide)
 endef
 
 $(eval $(call KernelPackage,ide-generic-old))
 
 
 define KernelPackage/ide-aec62xx
-$(call AddDepends/ide,@PCI_SUPPORT)
   TITLE:=Acard AEC62xx IDE driver
+  DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_BLK_DEV_AEC62XX
   FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,aec62xx,1)
+  $(call AddDepends/ide)
 endef
 
 define KernelPackage/ide-aec62xx/2.4
@@ -253,11 +315,12 @@ $(eval $(call KernelPackage,ide-aec62xx,1))
 
 
 define KernelPackage/ide-pdc202xx
-$(call AddDepends/ide,@PCI_SUPPORT)
   TITLE:=Promise PDC202xx IDE driver
+  DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
   FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old,1)
+  $(call AddDepends/ide)
 endef
 
 define KernelPackage/ide-pdc202xx/2.4
@@ -273,11 +336,12 @@ $(eval $(call KernelPackage,ide-pdc202xx))
 
 
 define KernelPackage/ide-it821x
-$(call AddDepends/ide,@PCI_SUPPORT)
   TITLE:=ITE IT821x IDE driver
+  DEPENDS:=@LINUX_2_6 @PCI_SUPPORT
   KCONFIG:=CONFIG_BLK_DEV_IT821X
   FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,it821x,1)
+  $(call AddDepends/ide)
 endef
 
 define KernelPackage/ide-it821x/description
@@ -287,33 +351,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 +390,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 +425,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))