From dbfc77de4c8dfc9920105f4cbe1dc5683c2cce90 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sun, 16 Sep 2007 19:09:01 +0000 Subject: [PATCH] rename kmod-libata to kmod-ata-core, add some missing descriptions, sort and cleanup SVN-Revision: 8811 --- package/kernel/modules/block.mk | 128 ++++++++++-------- target/linux/ixp4xx/profiles/300-NAS100d.mk | 3 +- .../linux/ixp4xx/profiles/400-DSMG600RevA.mk | 3 +- 3 files changed, 73 insertions(+), 61 deletions(-) diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index ce72abd111..2bccf0b47b 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -8,9 +8,54 @@ BLOCK_MENU:=Block Devices +define KernelPackage/ata-core + SUBMENU:=$(BLOCK_MENU) + TITLE:=Serial and Parallel ATA support + 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,ata-core)) + + +define KernelPackage/ata-artop + SUBMENU:=$(BLOCK_MENU) + TITLE:=ARTOP 6210/6260 PATA support + DEPENDS:=kmod-ata-core +kmod-scsi-core + KCONFIG:=CONFIG_PATA_ARTOP + FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,41,pata_artop) +endef + +define KernelPackage/ata-artop/description + PATA support for ARTOP 6210/6260 host controllers. +endef + +$(eval $(call KernelPackage,ata-artop)) + + +define KernelPackage/ata-piix + SUBMENU:=$(BLOCK_MENU) + TITLE:=Intel PIIX PATA/SATA support + DEPENDS:=kmod-ata-core +kmod-ide-core +kmod-scsi-core + KCONFIG:=CONFIG_ATA_PIIX + FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,41,ata_piix) +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. +endef + +$(eval $(call KernelPackage,ata-piix)) + + define KernelPackage/ide-core SUBMENU:=$(BLOCK_MENU) - TITLE:=Kernel support for IDE + TITLE:=IDE (ATA/ATAPI) device support KCONFIG:= \ CONFIG_IDE \ CONFIG_IDE_GENERIC \ @@ -45,33 +90,42 @@ endef $(eval $(call KernelPackage,ide-core)) -define KernelPackage/ide-pdc202xx - SUBMENU:=$(BLOCK_MENU) - TITLE:=PDC202xx IDE driver - DEPENDS:=@LINUX_2_4 - KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD - FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old) -endef - -$(eval $(call KernelPackage,ide-pdc202xx)) - - define KernelPackage/ide-aec62xx SUBMENU:=$(BLOCK_MENU) - TITLE:=AEC62xx IDE driver + TITLE:=Acard AEC62xx IDE driver DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_AEC62XX FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,aec62xx) endef +define KernelPackage/ide-aec62xx/description + Support for Acard AEC62xx (Artop ATP8xx) IDE controllers. +endef + $(eval $(call KernelPackage,ide-aec62xx)) +define KernelPackage/ide-pdc202xx + SUBMENU:=$(BLOCK_MENU) + TITLE:=Promise PDC202xx IDE driver + DEPENDS:=@LINUX_2_4 + KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD + FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old) +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/scsi-core SUBMENU:=$(BLOCK_MENU) - TITLE:=Kernel support for SCSI + TITLE:=SCSI device support KCONFIG:= \ CONFIG_SCSI \ CONFIG_BLK_DEV_SD @@ -82,47 +136,3 @@ define KernelPackage/scsi-core endef $(eval $(call KernelPackage,scsi-core)) - - -define KernelPackage/libata - SUBMENU:=$(BLOCK_MENU) - TITLE:=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)) - - -define KernelPackage/ata-piix - SUBMENU:=$(BLOCK_MENU) - TITLE:=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,41,ata_piix) -endef - -define KernelPackage/ata-piix/description - Kernel module for Intel PIIX SATA controller -endef - -$(eval $(call KernelPackage,ata-piix)) - - -define KernelPackage/pata-artop - SUBMENU:=$(BLOCK_MENU) - TITLE:=pata-artop - DEPENDS:=+kmod-libata +kmod-scsi-core - KCONFIG:=CONFIG_PATA_ARTOP - FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,pata_artop) -endef - -define KernelPackage/pata-artop/description - Kernel module for ARTOP PATA controller -endef - -$(eval $(call KernelPackage,pata-artop)) diff --git a/target/linux/ixp4xx/profiles/300-NAS100d.mk b/target/linux/ixp4xx/profiles/300-NAS100d.mk index f72128ecdc..2a43ac6d9b 100644 --- a/target/linux/ixp4xx/profiles/300-NAS100d.mk +++ b/target/linux/ixp4xx/profiles/300-NAS100d.mk @@ -9,7 +9,8 @@ define Profile/NAS100d NAME:=Iomega NAS 100d PACKAGES:=kmod-ixp4xx-npe \ kmod-madwifi wireless-tools \ - kmod-scsi-core kmod-libata kmod-pata-artop \ + kmod-scsi-core \ + kmod-ata-core kmod-ata-artop \ kmod-usb-core kmod-usb2 kmod-usb-storage \ kmod-fs-ext2 kmod-fs-ext3 endef diff --git a/target/linux/ixp4xx/profiles/400-DSMG600RevA.mk b/target/linux/ixp4xx/profiles/400-DSMG600RevA.mk index 4eec1c5c6c..aa2c64217e 100644 --- a/target/linux/ixp4xx/profiles/400-DSMG600RevA.mk +++ b/target/linux/ixp4xx/profiles/400-DSMG600RevA.mk @@ -9,7 +9,8 @@ define Profile/DSMG600RevA NAME:=DSM-G600 Rev A PACKAGES:=kmod-via-velocity \ kmod-madwifi wireless-tools \ - kmod-scsi-core kmod-libata kmod-pata-artop \ + kmod-scsi-core \ + kmod-ata-core kmod-ata-artop \ kmod-usb-core kmod-usb-uhci kmod-usb2 kmod-usb-storage \ kmod-fs-ext2 kmod-fs-ext3 endef