X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5d02fa2bd382b1a73ae57b8706bafa4f81701e34..1d1240855a20a954a108e5692182e9234a1a7f9a:/package/kernel/modules/block.mk?ds=inline diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 75f888590..6d67e72f7 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -25,7 +25,7 @@ $(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.ko AUTOLOAD:=$(call AutoLoad,21,libata,1) @@ -36,7 +36,7 @@ $(eval $(call KernelPackage,ata-core)) define AddDepends/ata SUBMENU:=$(BLOCK_MENU) - DEPENDS+=!TARGET_x86:kmod-ata-core $(1) + DEPENDS+=kmod-ata-core $(1) endef @@ -374,24 +374,10 @@ define KernelPackage/ide-core CONFIG_BLK_DEV_IDEDMA_PCI=y \ CONFIG_BLK_DEV_IDEPCI=y FILES:= \ - $(LINUX_DIR)/drivers/ide/ide-core.ko + $(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.ko \ - $(LINUX_DIR)/drivers/ide/ide-disk.ko - 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.ko - AUTOLOAD+= \ + $(call AutoLoad,20,ide-core,1) \ $(call AutoLoad,40,ide-gd_mod,1) endef @@ -399,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)) @@ -417,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.ko - AUTOLOAD+= \ - $(call AutoLoad,30,generic,1) -endef - -define KernelPackage/ide-generic/2.6 - FILES+= \ - $(LINUX_DIR)/drivers/ide/ide-pci-generic.ko - AUTOLOAD+= \ - $(call AutoLoad,30,ide-pci-generic,1) -endef - $(eval $(call KernelPackage,ide-generic)) @@ -458,10 +431,6 @@ define KernelPackage/ide-aec62xx $(call AddDepends/ide) endef -define KernelPackage/ide-aec62xx/2.4 - FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.ko -endef - define KernelPackage/ide-aec62xx/description Support for Acard AEC62xx (Artop ATP8xx) IDE controllers. endef @@ -478,10 +447,6 @@ define KernelPackage/ide-pdc202xx $(call AddDepends/ide) endef -define KernelPackage/ide-pdc202xx/2.4 - FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.ko -endef - define KernelPackage/ide-pdc202xx/description Support for the Promise Ultra 33/66/100 (PDC202{46|62|65|67|68}) IDE controllers. @@ -506,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 @@ -583,7 +612,6 @@ $(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 @@ -599,7 +627,7 @@ $(eval $(call KernelPackage,scsi-core)) define KernelPackage/scsi-generic SUBMENU:=$(BLOCK_MENU) TITLE:=Kernel support for SCSI generic - DEPENDS:=+!TARGET_x86:kmod-scsi-core + DEPENDS:=+kmod-scsi-core KCONFIG:= \ CONFIG_CHR_DEV_SG FILES:= \ @@ -613,7 +641,7 @@ $(eval $(call KernelPackage,scsi-generic)) define KernelPackage/scsi-cdrom SUBMENU:=$(BLOCK_MENU) TITLE:=Kernel support for CD / DVD drives - DEPENDS:=+!TARGET_x86:kmod-scsi-core + DEPENDS:=+kmod-scsi-core KCONFIG:= \ CONFIG_BLK_DEV_SR \ CONFIG_BLK_DEV_SR_VENDOR=n