X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5b8b96e82353a69ba96469e4a368260e93d2782d..1d1240855a20a954a108e5692182e9234a1a7f9a:/package/kernel/modules/block.mk?ds=inline diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 25024c697..6d67e72f7 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -11,7 +11,7 @@ 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) + FILES:=$(LINUX_DIR)/drivers/block/aoe/aoe.ko AUTOLOAD:=$(call AutoLoad,30,aoe) endef @@ -25,9 +25,9 @@ $(eval $(call KernelPackage,aoe)) define KernelPackage/ata-core SUBMENU:=$(BLOCK_MENU) TITLE:=Serial and Parallel ATA support - DEPENDS:=@PCI_SUPPORT +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86) + DEPENDS:=@PCI_SUPPORT +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax) KCONFIG:=CONFIG_ATA - FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/libata.ko AUTOLOAD:=$(call AutoLoad,21,libata,1) endef @@ -36,15 +36,20 @@ $(eval $(call KernelPackage,ata-core)) define AddDepends/ata SUBMENU:=$(BLOCK_MENU) - DEPENDS+=!TARGET_x86:kmod-ata-core $(1) + DEPENDS+=kmod-ata-core $(1) endef define KernelPackage/ata-ahci TITLE:=AHCI Serial ATA support KCONFIG:=CONFIG_SATA_AHCI - FILES:=$(LINUX_DIR)/drivers/ata/ahci.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,ahci,1) + FILES:=$(LINUX_DIR)/drivers/ata/ahci.ko + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.35)),1) + FILES += $(LINUX_DIR)/drivers/ata/libahci.ko + AUTOLOAD:=$(call AutoLoad,41,libahci ahci,1) + else + AUTOLOAD:=$(call AutoLoad,41,ahci,1) + endif $(call AddDepends/ata) endef @@ -58,7 +63,7 @@ $(eval $(call KernelPackage,ata-ahci)) define KernelPackage/ata-artop TITLE:=ARTOP 6210/6260 PATA support KCONFIG:=CONFIG_PATA_ARTOP - FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.ko AUTOLOAD:=$(call AutoLoad,41,pata_artop,1) $(call AddDepends/ata) endef @@ -73,7 +78,7 @@ $(eval $(call KernelPackage,ata-artop)) define KernelPackage/ata-nvidia-sata TITLE:=Nvidia Serial ATA support KCONFIG:=CONFIG_SATA_NV - FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.ko AUTOLOAD:=$(call AutoLoad,41,sata_nv,1) $(call AddDepends/ata) endef @@ -88,7 +93,7 @@ define KernelPackage/ata-pdc202xx-old KCONFIG:= \ CONFIG_ATA_SFF=y \ CONFIG_PATA_PDC_OLD - FILES:=$(LINUX_DIR)/drivers/ata/pata_pdc202xx_old.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/pata_pdc202xx_old.ko AUTOLOAD:=$(call AutoLoad,41,pata_pdc202xx_old,1) endef @@ -103,7 +108,7 @@ $(eval $(call KernelPackage,ata-pdc202xx-old)) define KernelPackage/ata-piix TITLE:=Intel PIIX PATA/SATA support KCONFIG:=CONFIG_ATA_PIIX - FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.ko AUTOLOAD:=$(call AutoLoad,41,ata_piix,1) $(call AddDepends/ata) endef @@ -119,7 +124,7 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/ata/sata_sil.ko AUTOLOAD:=$(call AutoLoad,41,sata_sil,1) $(call AddDepends/ata) endef @@ -134,7 +139,7 @@ $(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) + FILES:=$(LINUX_DIR)/drivers/ata/sata_sil24.ko AUTOLOAD:=$(call AutoLoad,41,sata_sil24,1) $(call AddDepends/ata) endef @@ -149,7 +154,7 @@ $(eval $(call KernelPackage,ata-sil24)) define KernelPackage/ata-via-sata TITLE:=VIA SATA support KCONFIG:=CONFIG_SATA_VIA - FILES:=$(LINUX_DIR)/drivers/ata/sata_via.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/sata_via.ko AUTOLOAD:=$(call AutoLoad,41,sata_via,1) $(call AddDepends/ata) endef @@ -165,7 +170,7 @@ define KernelPackage/block2mtd SUBMENU:=$(BLOCK_MENU) TITLE:=Block device MTD emulation KCONFIG:=CONFIG_MTD_BLOCK2MTD - FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.ko endef $(eval $(call KernelPackage,block2mtd)) @@ -178,20 +183,20 @@ define KernelPackage/dm # 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) + CONFIG_BLK_DEV_MD=n \ + CONFIG_DM_DEBUG=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_CRYPT \ + CONFIG_DM_MIRROR + FILES:=$(LINUX_DIR)/drivers/md/dm-*.ko + AUTOLOAD:=$(call AutoLoad,30,dm-mod dm-log dm-region-hash dm-mirror dm-crypt) endef define KernelPackage/dm/description @@ -201,6 +206,159 @@ endef $(eval $(call KernelPackage,dm)) +define KernelPackage/md-mod + SUBMENU:=$(BLOCK_MENU) + TITLE:=MD RAID + KCONFIG:= \ + CONFIG_MD=y \ + CONFIG_BLK_DEV_MD=m \ + CONFIG_MD_AUTODETECT=y \ + CONFIG_MD_FAULTY=n + FILES:=$(LINUX_DIR)/drivers/md/md-mod.ko + AUTOLOAD:=$(call AutoLoad,27,md-mod) +endef + +define KernelPackage/md-mod/description + Kernel RAID md module (md-mod.ko). + You will need to select at least one RAID level module below. +endef + +$(eval $(call KernelPackage,md-mod)) + + +define KernelPackage/md/Depends + SUBMENU:=$(BLOCK_MENU) + DEPENDS:=kmod-md-mod $(1) +endef + + +define KernelPackage/md-linear +$(call KernelPackage/md/Depends,) + TITLE:=RAID Linear Module + KCONFIG:=CONFIG_MD_LINEAR=m + FILES:=$(LINUX_DIR)/drivers/md/linear.ko + AUTOLOAD:=$(call AutoLoad,28,linear) +endef + +define KernelPackage/md-linear/description + RAID "Linear" or "Append" driver module (linear.ko) +endef + +$(eval $(call KernelPackage,md-linear)) + + +define KernelPackage/md-raid0 +$(call KernelPackage/md/Depends,) + TITLE:=RAID0 Module + KCONFIG:=CONFIG_MD_RAID0=m + FILES:=$(LINUX_DIR)/drivers/md/raid0.ko + AUTOLOAD:=$(call AutoLoad,28,raid0) +endef + +define KernelPackage/md-raid0/description + RAID Level 0 (Striping) driver module (raid0.ko) +endef + +$(eval $(call KernelPackage,md-raid0)) + + +define KernelPackage/md-raid1 +$(call KernelPackage/md/Depends,) + TITLE:=RAID1 Module + KCONFIG:=CONFIG_MD_RAID1=m + FILES:=$(LINUX_DIR)/drivers/md/raid1.ko + AUTOLOAD:=$(call AutoLoad,28,raid1) +endef + +define KernelPackage/md-raid1/description + RAID Level 1 (Mirroring) driver (raid1.ko) +endef + +$(eval $(call KernelPackage,md-raid1)) + + +define KernelPackage/md-raid10 +$(call KernelPackage/md/Depends,) + TITLE:=RAID10 Module + KCONFIG:=CONFIG_MD_RAID10=m + FILES:=$(LINUX_DIR)/drivers/md/raid10.ko + AUTOLOAD:=$(call AutoLoad,28,raid10) +endef + +define KernelPackage/md-raid10/description + RAID Level 10 (Mirroring+Striping) driver module (raid10.ko) +endef + +$(eval $(call KernelPackage,md-raid10)) + + +define KernelPackage/md-raid456 +$(call KernelPackage/md/Depends,) + TITLE:=RAID Level 456 Driver + KCONFIG:= \ + CONFIG_XOR_BLOCKS=m \ + CONFIG_ASYNC_CORE=m \ + CONFIG_ASYNC_MEMCPY=m \ + CONFIG_ASYNC_XOR=m \ + CONFIG_ASYNC_PQ=m \ + CONFIG_ASYNC_RAID6_RECOV=m \ + CONFIG_ASYNC_RAID6_TEST=n \ + CONFIG_MD_RAID6_PQ=m \ + CONFIG_MD_RAID456=m \ + CONFIG_MULTICORE_RAID456=n + FILES:= \ + $(LINUX_DIR)/crypto/xor.ko \ + $(LINUX_DIR)/crypto/async_tx/async_tx.ko \ + $(LINUX_DIR)/crypto/async_tx/async_memcpy.ko \ + $(LINUX_DIR)/crypto/async_tx/async_xor.ko \ + $(LINUX_DIR)/crypto/async_tx/async_pq.ko \ + $(LINUX_DIR)/crypto/async_tx/async_raid6_recov.ko \ + $(LINUX_DIR)/drivers/md/raid456.ko + # Additional files with kernel-dependent locations or presence + # For Linux >= 2.6.36 + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.36)), 1) + FILES+= \ + $(LINUX_DIR)/lib/raid6/raid6_pq.ko + # For Linux < 2.6.36 + else + FILES+= \ + $(LINUX_DIR)/drivers/md/raid6_pq.ko + endif + AUTOLOAD:=$(call AutoLoad,28, xor async_tx async_memcpy async_xor raid6_pq async_pq async_raid6_recov raid456) +endef + +define KernelPackage/md-raid456/description + RAID Level 4,5,6 kernel module (raid456.ko) + + Includes the following modules required by + raid456.ko: + xor.ko + async_tx.ko + async_xor.ko + async_memcpy.ko + async_pq.ko + async_raid5_recov.ko + raid6_pq.ko +endef + +$(eval $(call KernelPackage,md-raid456)) + + +define KernelPackage/md-multipath +$(call KernelPackage/md/Depends,) + TITLE:=MD Multipath Module + KCONFIG:=CONFIG_MD_MULTIPATH=m + FILES:=$(LINUX_DIR)/drivers/md/multipath.ko + AUTOLOAD:=$(call AutoLoad,29,multipath) +endef + +define KernelPackage/md-multipath/description + Multipath driver module (multipath.ko) +endef + +$(eval $(call KernelPackage,md-multipath)) + + define KernelPackage/ide-core SUBMENU:=$(BLOCK_MENU) TITLE:=IDE (ATA/ATAPI) device support @@ -212,27 +370,14 @@ define KernelPackage/ide-core CONFIG_IDE_GD \ CONFIG_IDE_GD_ATA=y \ CONFIG_IDE_GD_ATAPI=n \ + CONFIG_IDEPCI_PCIBUS_ORDER=y \ CONFIG_BLK_DEV_IDEDMA_PCI=y \ CONFIG_BLK_DEV_IDEPCI=y FILES:= \ - $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/ide/ide-core.ko \ + $(LINUX_DIR)/drivers/ide/ide-gd_mod.ko AUTOLOAD:= \ - $(call AutoLoad,20,ide-core,1) -endef - -define KernelPackage/ide-core/2.4 - FILES+= \ - $(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+= \ - $(call AutoLoad,35,ide-detect,1) \ - $(call AutoLoad,40,ide-disk,1) -endef - -define KernelPackage/ide-core/2.6 - FILES+= \ - $(LINUX_DIR)/drivers/ide/ide-gd_mod.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+= \ + $(call AutoLoad,20,ide-core,1) \ $(call AutoLoad,40,ide-gd_mod,1) endef @@ -240,8 +385,7 @@ 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-gd_mod (or ide-disk) + - ide-gd_mod endef $(eval $(call KernelPackage,ide-core)) @@ -258,23 +402,11 @@ define KernelPackage/ide-generic DEPENDS:=@PCI_SUPPORT TITLE:=Kernel support for generic PCI IDE chipsets KCONFIG:=CONFIG_BLK_DEV_GENERIC + FILES:=$(LINUX_DIR)/drivers/ide/ide-pci-generic.ko + AUTOLOAD:=$(call AutoLoad,30,ide-pci-generic,1) $(call AddDepends/ide) endef -define KernelPackage/ide-generic/2.4 - FILES+= \ - $(LINUX_DIR)/drivers/ide/pci/generic.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+= \ - $(call AutoLoad,30,generic,1) -endef - -define KernelPackage/ide-generic/2.6 - FILES+= \ - $(LINUX_DIR)/drivers/ide/ide-pci-generic.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+= \ - $(call AutoLoad,30,ide-pci-generic,1) -endef - $(eval $(call KernelPackage,ide-generic)) @@ -282,7 +414,7 @@ define KernelPackage/ide-generic-old SUBMENU:=$(BLOCK_MENU) TITLE:=Kernel support for generic (legacy) IDE chipsets KCONFIG:=CONFIG_IDE_GENERIC - FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.ko AUTOLOAD:=$(call AutoLoad,30,ide-generic,1) $(call AddDepends/ide) endef @@ -294,15 +426,11 @@ define KernelPackage/ide-aec62xx TITLE:=Acard AEC62xx IDE driver DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_AEC62XX - FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.ko AUTOLOAD:=$(call AutoLoad,30,aec62xx,1) $(call AddDepends/ide) endef -define KernelPackage/ide-aec62xx/2.4 - FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX) -endef - define KernelPackage/ide-aec62xx/description Support for Acard AEC62xx (Artop ATP8xx) IDE controllers. endef @@ -314,15 +442,11 @@ define KernelPackage/ide-pdc202xx TITLE:=Promise PDC202xx IDE driver DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD - FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.ko AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old,1) $(call AddDepends/ide) endef -define KernelPackage/ide-pdc202xx/2.4 - FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) -endef - define KernelPackage/ide-pdc202xx/description Support for the Promise Ultra 33/66/100 (PDC202{46|62|65|67|68}) IDE controllers. @@ -335,7 +459,7 @@ define KernelPackage/ide-it821x TITLE:=ITE IT821x IDE driver DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_IT821X - FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX) + FILES=$(LINUX_DIR)/drivers/ide/it821x.ko AUTOLOAD:=$(call AutoLoad,30,it821x,1) $(call AddDepends/ide) endef @@ -347,6 +471,70 @@ endef $(eval $(call KernelPackage,ide-it821x)) +define KernelPackage/cs5535 + TITLE:=NSC/AMD CS5535 chipset support + DEPENDS:=@TARGET_x86 + KCONFIG:=CONFIG_BLK_DEV_CS5535 + FILES=$(LINUX_DIR)/drivers/ide/cs5535.ko + AUTOLOAD:=$(call AutoLoad,30,cs5535,1) + $(call AddDepends/ide) +endef + +define KernelPackage/cs5535/description + Kernel module for the NSC/AMD CS5535 companion chip +endef + +$(eval $(call KernelPackage,cs5535)) + + +define KernelPackage/cs5536 + TITLE:=AMD CS5536 chipset support + DEPENDS:=@TARGET_x86 + KCONFIG:=CONFIG_BLK_DEV_CS5536 + FILES=$(LINUX_DIR)/drivers/ide/cs5536.ko + AUTOLOAD:=$(call AutoLoad,30,cs5536,1) + $(call AddDepends/ide) +endef + +define KernelPackage/cs5536/description + Kernel module for the AMD CS5536 Geode LX companion chip +endef + +$(eval $(call KernelPackage,cs5536)) + + +define KernelPackage/pata-cs5535 + TITLE:=CS5535 PATA support + DEPENDS:=@TARGET_x86 @PCI_SUPPORT + KCONFIG:=CONFIG_PATA_CS5535 + FILES=$(LINUX_DIR)/drivers/ata/pata_cs5535.ko + AUTOLOAD:=$(call AutoLoad,30,pata_cs5535,1) + $(call AddDepends/ata) +endef + +define KernelPackage/pata-cs5535/description + Kernel module for the NSC/AMD CS5535 companion chip +endef + +$(eval $(call KernelPackage,pata-cs5535)) + + +define KernelPackage/pata-cs5536 + TITLE:=CS5536 PATA support + DEPENDS:=@TARGET_x86 @PCI_SUPPORT + KCONFIG:=CONFIG_PATA_CS5536 + FILES=$(LINUX_DIR)/drivers/ata/pata_cs5536.ko + AUTOLOAD:=$(call AutoLoad,30,pata_cs5536,1) + $(call AddDepends/ata) +endef + +define KernelPackage/pata-cs5536/description + Kernel module for the AMD CS5536 Geode LX companion chip +endef + +$(eval $(call KernelPackage,pata-cs5536)) + + define KernelPackage/libsas SUBMENU:=$(BLOCK_MENU) TITLE:=SAS Domain Transport Attributes @@ -357,8 +545,8 @@ define KernelPackage/libsas CONFIG_SCSI_SAS_HOST_SMP=y \ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y FILES:= \ - $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.ko \ + $(LINUX_DIR)/drivers/scsi/libsas/libsas.ko AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas,1) endef @@ -375,7 +563,7 @@ define KernelPackage/loop KCONFIG:= \ CONFIG_BLK_DEV_LOOP \ CONFIG_BLK_DEV_CRYPTOLOOP=n - FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/loop.ko AUTOLOAD:=$(call AutoLoad,30,loop) endef @@ -391,10 +579,10 @@ define KernelPackage/mvsas 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) + ifneq ($(CONFIG_LINUX_2_6_30),) + FILES:=$(LINUX_DIR)/drivers/scsi/mvsas.ko else - FILES:=$(LINUX_DIR)/drivers/scsi/mvsas/mvsas.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/scsi/mvsas/mvsas.ko endif AUTOLOAD:=$(call AutoLoad,40,mvsas,1) endef @@ -410,7 +598,7 @@ define KernelPackage/nbd SUBMENU:=$(BLOCK_MENU) TITLE:=Network block device support KCONFIG:=CONFIG_BLK_DEV_NBD - FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/nbd.ko AUTOLOAD:=$(call AutoLoad,30,nbd) endef @@ -424,13 +612,12 @@ $(eval $(call KernelPackage,nbd)) define KernelPackage/scsi-core SUBMENU:=$(BLOCK_MENU) TITLE:=SCSI device support - DEPENDS:=@!TARGET_x86 KCONFIG:= \ CONFIG_SCSI \ CONFIG_BLK_DEV_SD FILES:= \ - $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX)) \ - $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) + $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.ko) \ + $(LINUX_DIR)/drivers/scsi/sd_mod.ko AUTOLOAD:=$(call AutoLoad,20,scsi_mod,1) $(call AutoLoad,40,sd_mod,1) endef @@ -440,11 +627,29 @@ $(eval $(call KernelPackage,scsi-core)) define KernelPackage/scsi-generic SUBMENU:=$(BLOCK_MENU) TITLE:=Kernel support for SCSI generic + DEPENDS:=+kmod-scsi-core KCONFIG:= \ CONFIG_CHR_DEV_SG FILES:= \ - $(LINUX_DIR)/drivers/scsi/sg.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/scsi/sg.ko AUTOLOAD:=$(call AutoLoad,65,sg) endef $(eval $(call KernelPackage,scsi-generic)) + + +define KernelPackage/scsi-cdrom + SUBMENU:=$(BLOCK_MENU) + TITLE:=Kernel support for CD / DVD drives + DEPENDS:=+kmod-scsi-core + KCONFIG:= \ + CONFIG_BLK_DEV_SR \ + CONFIG_BLK_DEV_SR_VENDOR=n + FILES:= \ + $(LINUX_DIR)/drivers/cdrom/cdrom.ko \ + $(LINUX_DIR)/drivers/scsi/sr_mod.ko + AUTOLOAD:=$(call AutoLoad,30,cdrom) $(call AutoLoad,45,sr_mod) +endef + +$(eval $(call KernelPackage,scsi-cdrom)) +