X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fblock.mk;h=62f08218c690778651cb57ae4fe90f360001b5e7;hp=b688084637c7c84d24ececf70737cc1f022c3f0e;hb=342d748eaff65811a1b11b944a9c66630d338ebc;hpb=eaadc5c4f97b91f76d2481b03102e68c8ef3c744 diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index b688084637..62f08218c6 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -16,7 +16,7 @@ define KernelPackage/aoe endef define KernelPackage/aoe/description - Kernel support for ATA over Ethernet + Kernel support for ATA over Ethernet endef $(eval $(call KernelPackage,aoe)) @@ -25,10 +25,12 @@ $(eval $(call KernelPackage,aoe)) define KernelPackage/ata-core SUBMENU:=$(BLOCK_MENU) TITLE:=Serial and Parallel ATA support - DEPENDS:=@PCI_SUPPORT +kmod-scsi-core + DEPENDS:=@PCI_SUPPORT||TARGET_sunxi +kmod-scsi-core KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.ko - AUTOLOAD:=$(call AutoLoad,21,libata,1) +ifneq ($(wildcard $(LINUX_DIR)/drivers/ata/libahci.ko),) + FILES+=$(LINUX_DIR)/drivers/ata/libahci.ko +endif endef $(eval $(call KernelPackage,ata-core)) @@ -44,19 +46,35 @@ define KernelPackage/ata-ahci TITLE:=AHCI Serial ATA support KCONFIG:=CONFIG_SATA_AHCI FILES:= \ - $(LINUX_DIR)/drivers/ata/ahci.ko \ - $(LINUX_DIR)/drivers/ata/libahci.ko + $(LINUX_DIR)/drivers/ata/ahci.ko AUTOLOAD:=$(call AutoLoad,41,libahci ahci,1) $(call AddDepends/ata) endef define KernelPackage/ata-ahci/description - Support for AHCI Serial ATA controllers. + Support for AHCI Serial ATA controllers endef $(eval $(call KernelPackage,ata-ahci)) +define KernelPackage/ata-ahci-platform + TITLE:=AHCI Serial ATA Platform support + KCONFIG:=CONFIG_SATA_AHCI_PLATFORM + FILES:= \ + $(LINUX_DIR)/drivers/ata/ahci_platform.ko \ + $(LINUX_DIR)/drivers/ata/libahci_platform.ko + AUTOLOAD:=$(call AutoLoad,40,libahci libahci_platform ahci_platform,1) + $(call AddDepends/ata,@TARGET_ipq806x||TARGET_sunxi) +endef + +define KernelPackage/ata-ahci-platform/description + Platform support for AHCI Serial ATA controllers +endef + +$(eval $(call KernelPackage,ata-ahci-platform)) + + define KernelPackage/ata-artop TITLE:=ARTOP 6210/6260 PATA support KCONFIG:=CONFIG_PATA_ARTOP @@ -66,7 +84,7 @@ define KernelPackage/ata-artop endef define KernelPackage/ata-artop/description - PATA support for ARTOP 6210/6260 host controllers. + PATA support for ARTOP 6210/6260 host controllers endef $(eval $(call KernelPackage,ata-artop)) @@ -111,7 +129,7 @@ endef define KernelPackage/ata-pdc202xx-old/description This option enables support for the Promise 20246, 20262, 20263, - 20265 and 20267 adapters. + 20265 and 20267 adapters endef $(eval $(call KernelPackage,ata-pdc202xx-old)) @@ -127,7 +145,7 @@ endef define KernelPackage/ata-piix/description SATA support for Intel ICH5/6/7/8 series host controllers and - PATA support for Intel ESB/ICH/PIIX3/PIIX4 series host controllers. + PATA support for Intel ESB/ICH/PIIX3/PIIX4 series host controllers endef $(eval $(call KernelPackage,ata-piix)) @@ -142,7 +160,7 @@ define KernelPackage/ata-sil endef define KernelPackage/ata-sil/description - Support for Silicon Image Serial ATA controllers. + Support for Silicon Image Serial ATA controllers endef $(eval $(call KernelPackage,ata-sil)) @@ -157,7 +175,7 @@ define KernelPackage/ata-sil24 endef define KernelPackage/ata-sil24/description - Support for Silicon Image 3124/3132 Serial ATA controllers. + Support for Silicon Image 3124/3132 Serial ATA controllers endef $(eval $(call KernelPackage,ata-sil24)) @@ -172,7 +190,7 @@ define KernelPackage/ata-via-sata endef define KernelPackage/ata-via-sata/description - This option enables support for VIA Serial ATA. + This option enables support for VIA Serial ATA endef $(eval $(call KernelPackage,ata-via-sata)) @@ -200,6 +218,8 @@ define KernelPackage/dm CONFIG_DM_DEBUG=n \ CONFIG_DM_UEVENT=n \ CONFIG_DM_DELAY=n \ + CONFIG_DM_LOG_WRITES=n \ + CONFIG_DM_MQ_DEFAULT=n \ CONFIG_DM_MULTIPATH=n \ CONFIG_DM_ZERO=n \ CONFIG_DM_SNAPSHOT=n \ @@ -306,7 +326,7 @@ $(eval $(call KernelPackage,md-raid10)) define KernelPackage/md-raid456 -$(call KernelPackage/md/Depends,+kmod-lib-raid6 +kmod-lib-xor) +$(call KernelPackage/md/Depends,+kmod-lib-raid6 +kmod-lib-xor +!LINUX_3_18:kmod-lib-crc32c) TITLE:=RAID Level 456 Driver KCONFIG:= \ CONFIG_ASYNC_CORE \ @@ -359,118 +379,6 @@ endef $(eval $(call KernelPackage,md-multipath)) -define KernelPackage/ide-core - SUBMENU:=$(BLOCK_MENU) - TITLE:=IDE (ATA/ATAPI) device support - DEPENDS:=@PCI_SUPPORT - KCONFIG:= \ - CONFIG_IDE \ - CONFIG_BLK_DEV_IDE \ - CONFIG_BLK_DEV_IDEDISK \ - 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.ko \ - $(LINUX_DIR)/drivers/ide/ide-gd_mod.ko - AUTOLOAD:= \ - $(call AutoLoad,20,ide-core,1) \ - $(call AutoLoad,40,ide-gd_mod,1) -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-gd_mod -endef - -$(eval $(call KernelPackage,ide-core)) - - -define AddDepends/ide - SUBMENU:=$(BLOCK_MENU) - DEPENDS+=kmod-ide-core $(1) -endef - - -define KernelPackage/ide-generic - SUBMENU:=$(BLOCK_MENU) - 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 - -$(eval $(call KernelPackage,ide-generic)) - - -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.ko - AUTOLOAD:=$(call AutoLoad,30,ide-generic,1) - $(call AddDepends/ide) -endef - -$(eval $(call KernelPackage,ide-generic-old)) - - -define KernelPackage/ide-aec62xx - TITLE:=Acard AEC62xx IDE driver - DEPENDS:=@PCI_SUPPORT - KCONFIG:=CONFIG_BLK_DEV_AEC62XX - FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.ko - AUTOLOAD:=$(call AutoLoad,30,aec62xx,1) - $(call AddDepends/ide) -endef - -define KernelPackage/ide-aec62xx/description - Support for Acard AEC62xx (Artop ATP8xx) IDE controllers. -endef - -$(eval $(call KernelPackage,ide-aec62xx,1)) - - -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.ko - AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old,1) - $(call AddDepends/ide) -endef - -define KernelPackage/ide-pdc202xx/description - Support for the Promise Ultra 33/66/100 (PDC202{46|62|65|67|68}) IDE - controllers. -endef - -$(eval $(call KernelPackage,ide-pdc202xx)) - - -define KernelPackage/ide-it821x - TITLE:=ITE IT821x IDE driver - DEPENDS:=@PCI_SUPPORT - KCONFIG:=CONFIG_BLK_DEV_IT821X - FILES=$(LINUX_DIR)/drivers/ide/it821x.ko - AUTOLOAD:=$(call AutoLoad,30,it821x,1) - $(call AddDepends/ide) -endef - -define KernelPackage/ide-it821x/description - Kernel module for the ITE IDE821x IDE controllers. -endef - -$(eval $(call KernelPackage,ide-it821x)) - - define KernelPackage/libsas SUBMENU:=$(BLOCK_MENU) DEPENDS:=@TARGET_x86 @@ -487,7 +395,7 @@ define KernelPackage/libsas endef define KernelPackage/libsas/description - SAS Domain Transport Attributes support. + SAS Domain Transport Attributes support endef $(eval $(call KernelPackage,libsas,1)) @@ -522,7 +430,7 @@ define KernelPackage/mvsas endef define KernelPackage/mvsas/description - Kernel support for the Marvell SAS SCSI adapters + Kernel support for the Marvell SAS SCSI adapters endef $(eval $(call KernelPackage,mvsas)) @@ -550,9 +458,9 @@ define KernelPackage/scsi-core CONFIG_SCSI \ CONFIG_BLK_DEV_SD FILES:= \ - $(if $(findstring y,$(CONFIG_SCSI)),,$(LINUX_DIR)/drivers/scsi/scsi_mod.ko) \ + $(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) + AUTOLOAD:=$(call AutoLoad,40,scsi_mod sd_mod,1) endef $(eval $(call KernelPackage,scsi-core)) @@ -582,8 +490,21 @@ define KernelPackage/scsi-cdrom FILES:= \ $(LINUX_DIR)/drivers/cdrom/cdrom.ko \ $(LINUX_DIR)/drivers/scsi/sr_mod.ko - AUTOLOAD:=$(call AutoLoad,30,cdrom) $(call AutoLoad,45,sr_mod) + AUTOLOAD:=$(call AutoLoad,45,sr_mod) endef $(eval $(call KernelPackage,scsi-cdrom)) + +define KernelPackage/scsi-tape + SUBMENU:=$(BLOCK_MENU) + TITLE:=Kernel support for scsi tape drives + DEPENDS:=+kmod-scsi-core + KCONFIG:= \ + CONFIG_CHR_DEV_ST + FILES:= \ + $(LINUX_DIR)/drivers/scsi/st.ko + AUTOLOAD:=$(call AutoLoad,45,st) +endef + +$(eval $(call KernelPackage,scsi-tape))