X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fblock.mk;h=8a4c68a8826a9b30ab22ca6a7379521e222a1628;hp=cc8398335c80abc5f7a5f8503d1fd3d98bc81778;hb=eb30c3b7ceb6ded6394c37007a25fd887ac44d8b;hpb=031ab4fed44cadaefbd5a9785a06959ee3dc39a8 diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index cc8398335c..8a4c68a882 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -1,32 +1,52 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ BLOCK_MENU:=Block Devices +define KernelPackage/aoe + SUBMENU:=$(BLOCK_MENU) + TITLE:=ATA over Ethernet support + DEPENDS:=@LINUX_2_6 + KCONFIG:=CONFIG_ATA_OVER_ETH + FILES:=$(LINUX_DIR)/drivers/block/aoe/aoe.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,aoe) +endef + +define KernelPackage/aoe/description + Kernel support for ATA over Ethernet +endef + +$(eval $(call KernelPackage,aoe)) + + define KernelPackage/ata-core SUBMENU:=$(BLOCK_MENU) TITLE:=Serial and Parallel ATA support - DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core + DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86) KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,21,libata) + AUTOLOAD:=$(call AutoLoad,21,libata,1) endef $(eval $(call KernelPackage,ata-core)) -define KernelPackage/ata-ahci +define AddDepends/ata SUBMENU:=$(BLOCK_MENU) + DEPENDS+=!TARGET_x86:kmod-ata-core $(1) +endef + + +define KernelPackage/ata-ahci TITLE:=AHCI Serial ATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_SATA_AHCI FILES:=$(LINUX_DIR)/drivers/ata/ahci.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,ahci) + AUTOLOAD:=$(call AutoLoad,41,ahci,1) + $(call AddDepends/ata) endef define KernelPackage/ata-ahci/description @@ -37,12 +57,11 @@ $(eval $(call KernelPackage,ata-ahci)) define KernelPackage/ata-artop - SUBMENU:=$(BLOCK_MENU) TITLE:=ARTOP 6210/6260 PATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_PATA_ARTOP FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,pata_artop) + AUTOLOAD:=$(call AutoLoad,41,pata_artop,1) + $(call AddDepends/ata) endef define KernelPackage/ata-artop/description @@ -52,41 +71,42 @@ endef $(eval $(call KernelPackage,ata-artop)) -define KernelPackage/ata-ixp4xx-cf - SUBMENU:=$(BLOCK_MENU) - TITLE:=IXP4XX Compact Flash support - DEPENDS:=kmod-ata-core - KCONFIG:=CONFIG_PATA_IXP4XX_CF - FILES:=$(LINUX_DIR)/drivers/ata/pata_ixp4xx_cf.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,pata_ixp4xx_cf) -endef - -define KernelPackage/ata-ixp4xx-cf/description - IXP4XX Compact Flash support. +define KernelPackage/ata-nvidia-sata + TITLE:=Nvidia Serial ATA support + KCONFIG:=CONFIG_SATA_NV + FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,41,sata_nv,1) + $(call AddDepends/ata) endef -$(eval $(call KernelPackage,ata-ixp4xx-cf)) +$(eval $(call KernelPackage,ata-nvidia-sata)) -define KernelPackage/ata-nvidia-sata +define KernelPackage/ata-pdc202xx-old SUBMENU:=$(BLOCK_MENU) - TITLE:=Nvidia Serial ATA support + TITLE:=Older Promise PATA controller support DEPENDS:=kmod-ata-core - KCONFIG:=CONFIG_SATA_NV - FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,sata_nv) + KCONFIG:= \ + CONFIG_ATA_SFF=y \ + CONFIG_PATA_PDC_OLD + FILES:=$(LINUX_DIR)/drivers/ata/pata_pdc202xx_old.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,41,pata_pdc202xx_old,1) endef -$(eval $(call KernelPackage,ata-nvidia-sata)) +define KernelPackage/ata-pdc202xx-old/description + This option enables support for the Promise 20246, 20262, 20263, + 20265 and 20267 adapters. +endef + +$(eval $(call KernelPackage,ata-pdc202xx-old)) define KernelPackage/ata-piix - SUBMENU:=$(BLOCK_MENU) TITLE:=Intel PIIX PATA/SATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_ATA_PIIX FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,ata_piix) + AUTOLOAD:=$(call AutoLoad,41,ata_piix,1) + $(call AddDepends/ata) endef define KernelPackage/ata-piix/description @@ -97,13 +117,42 @@ endef $(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) + AUTOLOAD:=$(call AutoLoad,41,sata_sil,1) + $(call AddDepends/ata) +endef + +define KernelPackage/ata-sil/description + Support for Silicon Image Serial ATA controllers. +endef + +$(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) + AUTOLOAD:=$(call AutoLoad,41,sata_sil24,1) + $(call AddDepends/ata) +endef + +define KernelPackage/ata-sil24/description + Support for Silicon Image 3124/3132 Serial ATA controllers. +endef + +$(eval $(call KernelPackage,ata-sil24)) + + define KernelPackage/ata-via-sata - SUBMENU:=$(BLOCK_MENU) TITLE:=VIA SATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_SATA_VIA FILES:=$(LINUX_DIR)/drivers/ata/sata_via.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,sata_via) + AUTOLOAD:=$(call AutoLoad,41,sata_via,1) + $(call AddDepends/ata) endef define KernelPackage/ata-via-sata/description @@ -113,91 +162,169 @@ endef $(eval $(call KernelPackage,ata-via-sata)) +define KernelPackage/block2mtd + SUBMENU:=$(BLOCK_MENU) + TITLE:=Block device MTD emulation + DEPENDS:=@LINUX_2_6 + KCONFIG:=CONFIG_MTD_BLOCK2MTD + FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.$(LINUX_KMOD_SUFFIX) +endef + +$(eval $(call KernelPackage,block2mtd)) + + +define KernelPackage/dm + SUBMENU:=$(BLOCK_MENU) + TITLE:=Device Mapper + DEPENDS:=@LINUX_2_6 + # All the "=n" are unnecessary, they're only there + # 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) +endef + +define KernelPackage/dm/description + Kernel module necessary for LVM2 support +endef + +$(eval $(call KernelPackage,dm)) + + define KernelPackage/ide-core SUBMENU:=$(BLOCK_MENU) TITLE:=IDE (ATA/ATAPI) device support DEPENDS:=@PCI_SUPPORT KCONFIG:= \ CONFIG_IDE \ - CONFIG_IDE_GENERIC \ - CONFIG_BLK_DEV_GENERIC \ CONFIG_BLK_DEV_IDE \ CONFIG_BLK_DEV_IDEDISK \ + CONFIG_IDE_GD \ + CONFIG_IDE_GD_ATA=y \ + CONFIG_IDE_GD_ATAPI=n \ 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-disk.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,40,ide-disk) + $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:= \ + $(call AutoLoad,20,ide-core,1) endef define KernelPackage/ide-core/2.4 - FILES+=$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+=$(call AutoLoad,30,ide-detect) -endef - -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.26)),1) - define KernelPackage/ide-core/2.6 - FILES+=$(LINUX_DIR)/drivers/ide/pci/ide-pci-generic.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+=$(call AutoLoad,30,ide-pci-generic) - endef -else - define KernelPackage/ide-core/2.6 - FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+=$(call AutoLoad,30,ide-generic) - endef -endif + 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,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-detect - - ide-disk + - ide-gd_mod (or ide-disk) endef $(eval $(call KernelPackage,ide-core)) -define KernelPackage/ide-aec62xx +define AddDepends/ide SUBMENU:=$(BLOCK_MENU) - TITLE:=Acard AEC62xx IDE driver - DEPENDS:=@PCI_SUPPORT +kmod-ide-core - KCONFIG:=CONFIG_BLK_DEV_AEC62XX - FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,aec62xx) + DEPENDS+=kmod-ide-core $(1) endef -define KernelPackage/ide-aec62xx/description - Support for Acard AEC62xx (Artop ATP8xx) IDE controllers. + +define KernelPackage/ide-generic + SUBMENU:=$(BLOCK_MENU) + DEPENDS:=@PCI_SUPPORT + TITLE:=Kernel support for generic PCI IDE chipsets + KCONFIG:=CONFIG_BLK_DEV_GENERIC + $(call AddDepends/ide) endef -$(eval $(call KernelPackage,ide-aec62xx)) +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 -define KernelPackage/ide-magicbox +$(eval $(call KernelPackage,ide-generic)) + + +define KernelPackage/ide-generic-old SUBMENU:=$(BLOCK_MENU) - TITLE:=Magicbox 2.0 IDE CF driver - DEPENDS:=@TARGET_magicbox +kmod-ide-core - KCONFIG:=CONFIG_BLK_DEV_MAGICBOX_IDE - FILES:=$(LINUX_DIR)/drivers/ide/ppc/magicbox_ide.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,magicbox_ide) + DEPENDS:=@LINUX_2_6 + TITLE:=Kernel support for generic (legacy) IDE chipsets + KCONFIG:=CONFIG_IDE_GENERIC + FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,ide-generic,1) + $(call AddDepends/ide) endef -define KernelPackage/ide-magicbox/description - Support for Magicbox 2.0 onboard CF slot. +$(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.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,aec62xx,1) + $(call AddDepends/ide) endef -$(eval $(call KernelPackage,ide-magicbox)) +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 + +$(eval $(call KernelPackage,ide-aec62xx,1)) define KernelPackage/ide-pdc202xx - SUBMENU:=$(BLOCK_MENU) TITLE:=Promise PDC202xx IDE driver - DEPENDS:=@LINUX_2_4 +kmod-ide-core + DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD + FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX) + 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) - AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old) endef define KernelPackage/ide-pdc202xx/description @@ -208,32 +335,42 @@ endef $(eval $(call KernelPackage,ide-pdc202xx)) -define KernelPackage/scsi-core - SUBMENU:=$(BLOCK_MENU) - TITLE:=SCSI device support - 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) +define KernelPackage/ide-it821x + TITLE:=ITE IT821x IDE driver + DEPENDS:=@LINUX_2_6 @PCI_SUPPORT + KCONFIG:=CONFIG_BLK_DEV_IT821X + FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,it821x,1) + $(call AddDepends/ide) endef -$(eval $(call KernelPackage,scsi-core)) +define KernelPackage/ide-it821x/description + Kernel module for the ITE IDE821x IDE controllers. +endef +$(eval $(call KernelPackage,ide-it821x)) -define KernelPackage/scsi-generic + +define KernelPackage/libsas SUBMENU:=$(BLOCK_MENU) - TITLE:=Kernel support for SCSI generic - KCONFIG:= \ - CONFIG_CHR_DEV_SG + TITLE:=SAS Domain Transport Attributes + DEPENDS:=@TARGET_x86 + KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \ + CONFIG_SCSI_SAS_ATTRS \ + CONFIG_SCSI_SAS_ATA=y \ + CONFIG_SCSI_SAS_HOST_SMP=y \ + CONFIG_SCSI_SAS_LIBSAS_DEBUG=y FILES:= \ - $(LINUX_DIR)/drivers/scsi/sg.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,65,sg) + $(LINUX_DIR)/drivers/scsi/scsi_transport_sas.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,29,scsi_transport_sas libsas,1) endef -$(eval $(call KernelPackage,scsi-generic)) +define KernelPackage/libsas/description + SAS Domain Transport Attributes support. +endef + +$(eval $(call KernelPackage,libsas,1)) define KernelPackage/loop @@ -253,6 +390,26 @@ endef $(eval $(call KernelPackage,loop)) +define KernelPackage/mvsas + SUBMENU:=$(BLOCK_MENU) + 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) + else + FILES:=$(LINUX_DIR)/drivers/scsi/mvsas/mvsas.$(LINUX_KMOD_SUFFIX) + endif + AUTOLOAD:=$(call AutoLoad,40,mvsas,1) +endef + +define KernelPackage/mvsas/description + Kernel support for the Marvell SAS SCSI adapters +endef + +$(eval $(call KernelPackage,mvsas)) + + define KernelPackage/nbd SUBMENU:=$(BLOCK_MENU) TITLE:=Network block device support @@ -268,17 +425,30 @@ endef $(eval $(call KernelPackage,nbd)) -define KernelPackage/pata-rb153-cf +define KernelPackage/scsi-core SUBMENU:=$(BLOCK_MENU) - DEPENDS:=kmod-ata-core @TARGET_adm5120_router_le - TITLE:=RouterBOARD 153 CF Slot support - KCONFIG:=CONFIG_PATA_RB153_CF - FILES:=$(LINUX_DIR)/drivers/ata/pata_rb153_cf.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,pata_rb153_cf) + 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) + AUTOLOAD:=$(call AutoLoad,20,scsi_mod,1) $(call AutoLoad,40,sd_mod,1) endef -define KernelPackage/pata-rb153-cf/description - Kernel support for the RouterBoard 153 CF slot. +$(eval $(call KernelPackage,scsi-core)) + + +define KernelPackage/scsi-generic + SUBMENU:=$(BLOCK_MENU) + TITLE:=Kernel support for SCSI generic + KCONFIG:= \ + CONFIG_CHR_DEV_SG + FILES:= \ + $(LINUX_DIR)/drivers/scsi/sg.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,65,sg) endef -$(eval $(call KernelPackage,pata-rb153-cf)) +$(eval $(call KernelPackage,scsi-generic))