fix KCONFIG in packages: move back all KCONFIG from package variants to the main...

[openwrt/staging/yousong.git] / package / kernel / modules / block.mk

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index c8a8f9040f7ba3b983ad0a99f78ec1ab8f96a8d8..1fea5c4c5cdcf16a18e13d4ed06274a5e4e898cc 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -3,30 +3,35 @@ BLMENU:=Block Devices
 define KernelPackage/ide-core
   SUBMENU:=$(BLMENU)
   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 CONFIG_BLK_DEV_IDE CONFIG_IDE_GENERIC CONFIG_BLK_DEV_IDEDISK
-endef
-
-define KernelPackage/ide-core/2.4
+  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-disk.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic 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))
@@ -58,10 +63,13 @@ $(eval $(call KernelPackage,ide-aec62xx))
 define KernelPackage/scsi-core
   SUBMENU:=$(BLMENU)
   TITLE:=Kernel support for SCSI
-  KCONFIG:=CONFIG_SCSI CONFIG_BLK_DEV_SD
+  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))
@@ -70,10 +78,10 @@ $(eval $(call KernelPackage,scsi-core))
 define KernelPackage/libata
   SUBMENU:=$(BLMENU)
   TITLE:=libata
-  DESCRIPTION:=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))
@@ -82,11 +90,14 @@ $(eval $(call KernelPackage,libata))
 define KernelPackage/ata-piix
   SUBMENU:=$(BLMENU)
   TITLE:=ata-piix
-  DESCRIPTION:=Kernel module for Intel PIIX SATA controller
   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,30,scsi_mod libata sd_mod ata_piix)
+  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))
@@ -95,11 +106,14 @@ $(eval $(call KernelPackage,ata-piix))
 define KernelPackage/pata-artop
   SUBMENU:=$(BLMENU)
   TITLE:=pata-artop
-  DESCRIPTION:=Kernel module for ARTOP PATA controller
-  DEPENDS:=kmod-libata +kmod-scsi-core
+  DEPENDS:=+kmod-libata +kmod-scsi-core
   KCONFIG:=CONFIG_PATA_ARTOP
   FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod pata_artop)
+  AUTOLOAD:=$(call AutoLoad,41,pata_artop)
+endef
+
+define KernelPackage/pata-artop/description
+ Kernel module for ARTOP PATA controller
 endef
 
 $(eval $(call KernelPackage,pata-artop))