X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/263c7a706996b2991462fdc47146cb9a7a6ac19f..b438225ea496fec2a58eb506d2ca68f3ec3c833b:/package/kernel/modules/block.mk

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index cecddda04..1fea5c4c5 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -1,93 +1,119 @@
 BLMENU:=Block Devices
 
 define KernelPackage/ide-core
-  TITLE:=Kernel support for IDE
-  DESCRIPTION:=\
-	Useful for usb mass storage devices (e.g. on WL-HDD)\\\
-	\\\
-	Includes: \\\
-	- ide-core \\\
-	- ide-detect \\\
-	- ide-disk
-  KCONFIG:=CONFIG_IDE
   SUBMENU:=$(BLMENU)
-endef
-define KernelPackage/ide-core/2.4
+  TITLE:=Kernel support for IDE
+  KCONFIG:= \
+	CONFIG_IDE \
+	CONFIG_IDE_GENERIC \
+	CONFIG_BLK_DEV_IDE \
+	CONFIG_IDE_GENERIC \
+	CONFIG_BLK_DEV_IDEDISK
   FILES:= \
 	$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
+  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-disk)
+endef
+
+define KernelPackage/ide-core/2.4
+  FILES+=$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD+=$(call AutoLoad,30,ide-detect)
 endef
+
 define KernelPackage/ide-core/2.6
-  FILES:= \
-	$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-detect ide-disk)
+#  KCONFIG+=CONFIG_IDE_GENERIC
+  FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD+=$(call AutoLoad,30,ide-generic)
+endef
+
+define KernelPackage/ide-core/description
+ Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)
+ Includes:
+ - ide-core
+ - ide-detect
+ - ide-disk
 endef
+
 $(eval $(call KernelPackage,ide-core))
 
+
 define KernelPackage/ide-pdc202xx
-  TITLE:=PDC202xx IDE driver
   SUBMENU:=$(BLMENU)
+  TITLE:=PDC202xx IDE driver
   DEPENDS:=@LINUX_2_4
   KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
   FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
 endef
+
 $(eval $(call KernelPackage,ide-pdc202xx))
 
+
 define KernelPackage/ide-aec62xx
-  TITLE:=AEC62xx IDE driver
   SUBMENU:=$(BLMENU)
+  TITLE:=AEC62xx IDE driver
   KCONFIG:=CONFIG_BLK_DEV_AEC62XX
   FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,aec62xx)
 endef
+
 $(eval $(call KernelPackage,ide-aec62xx))
 
+
 define KernelPackage/scsi-core
-  TITLE:=Kernel support for SCSI
   SUBMENU:=$(BLMENU)
-  KCONFIG:=CONFIG_SCSI CONFIG_BLK_DEV_SD
+  TITLE:=Kernel support for SCSI
+  KCONFIG:= \
+	CONFIG_SCSI \
+	CONFIG_BLK_DEV_SD
   FILES:= \
-    $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
-    $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,scsi_mod) $(call AutoLoad,40,sd_mod)
 endef
+
 $(eval $(call KernelPackage,scsi-core))
 
+
 define KernelPackage/libata
-	TITLE:=libata
-	DESCRIPTION:=libata
-	KCONFIG:=CONFIG_ATA
-	SUBMENU:=$(BLMENU)
-	FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
-	DEPENDS:=@PCI_SUPPORT @LINUX_2_6
+  SUBMENU:=$(BLMENU)
+  TITLE:=libata
+  DEPENDS:=@PCI_SUPPORT @LINUX_2_6
+  KCONFIG:=CONFIG_ATA
+  FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,21,libata)
 endef
+
 $(eval $(call KernelPackage,libata))
 
+
 define KernelPackage/ata-piix
-	TITLE:=ata-piix
-	DESCRIPTION:=Kernel module for Intel PIIX SATA controller
-	KCONFIG:=CONFIG_ATA_PIIX
-	SUBMENU:=$(BLMENU)
-	AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix)
-	FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
-	DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
+  SUBMENU:=$(BLMENU)
+  TITLE:=ata-piix
+  DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core
+  KCONFIG:=CONFIG_ATA_PIIX
+  FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,41,ata_piix)
+endef
+
+define KernelPackage/ata-piix/description
+ Kernel module for Intel PIIX SATA controller
 endef
+
 $(eval $(call KernelPackage,ata-piix))
 
+
 define KernelPackage/pata-artop
-	TITLE:=pata-artop
-	DESCRIPTION:=Kernel module for ARTOP PATA controller
-	KCONFIG:=CONFIG_PATA_ARTOP
-	SUBMENU:=$(BLMENU)
-	AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod pata_artop)
-	FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
-	DEPENDS:=kmod-libata +kmod-scsi-core
+  SUBMENU:=$(BLMENU)
+  TITLE:=pata-artop
+  DEPENDS:=+kmod-libata +kmod-scsi-core
+  KCONFIG:=CONFIG_PATA_ARTOP
+  FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,41,pata_artop)
 endef
-$(eval $(call KernelPackage,pata-artop))
 
+define KernelPackage/pata-artop/description
+ Kernel module for ARTOP PATA controller
+endef
 
+$(eval $(call KernelPackage,pata-artop))