diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-03 08:58:14 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-03 08:58:14 +0000 |
| commit | 9a571e2771c44f1f79cd3a0dc6112c92b388bcb9 (patch) | |
| tree | 29fc1ebb2e89d2e529607ed463481241e55d09ce /package/kernel/modules/block.mk | |
| parent | 0a07865503840bb4dd7a03de1ff1161a4fa61364 (diff) | |
require all CONFIG_* symbols listed in its KCONFIG to be set to m in order to actually build a kmod package, tweak and fix kernel package definitions.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8591 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules/block.mk')
| -rw-r--r-- | package/kernel/modules/block.mk | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index c8a8f9040..5ab3688b0 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -10,23 +10,25 @@ define KernelPackage/ide-core - 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_BLK_DEV_IDE \ + 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 $(eval $(call KernelPackage,ide-core)) @@ -58,10 +60,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) + AUTOLOAD:=$(call AutoLoad,20,scsi_mod) $(call AutoLoad,40,sd_mod) endef $(eval $(call KernelPackage,scsi-core)) @@ -70,10 +75,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)) @@ -86,7 +91,7 @@ define KernelPackage/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,30,scsi_mod libata sd_mod ata_piix) + AUTOLOAD:=$(call AutoLoad,41,ata_piix) endef $(eval $(call KernelPackage,ata-piix)) @@ -96,10 +101,10 @@ 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 $(eval $(call KernelPackage,pata-artop)) |