From fbbad27a4191281115a486029d54fca0ead77e72 Mon Sep 17 00:00:00 2001 From: Tim Yardley Date: Wed, 7 Mar 2007 15:38:45 +0000 Subject: [PATCH] split out scsi module support and add ata piix support SVN-Revision: 6535 --- package/kernel/modules/block.mk | 21 +++++++++++ package/kernel/modules/other.mk | 10 ++++++ package/kernel/modules/usb.mk | 3 +- target/linux/x86-2.6/config/default | 55 +++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 package/kernel/modules/block.mk diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk new file mode 100644 index 0000000000..a6df0fc662 --- /dev/null +++ b/package/kernel/modules/block.mk @@ -0,0 +1,21 @@ +BLMENU:=Block Devices + +define KernelPackage/libata + TITLE:=libata + DESCRIPTION:=libata + KCONFIG:=$(CONFIG_ATA) + SUBMENU:=$(BLMENU) + FILES:=$(MODULES_DIR)/kernel/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) +endef +$(eval $(call KernelPackage,libata)) + +define KernelPackage/ata-piix + TITLE:=ata-piix + DESCRIPTION:=Kernel module for Intel PIIX SATA controller + KCONFIG:=$(CONFIG_ATA_PIIX) + SUBMENU:=$(BLMENU) + AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix) + FILES:=$(MODULES_DIR)/kernel/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) + DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core +endef +$(eval $(call KernelPackage,ata-piix)) diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index b65df98ff5..e9cefcb16a 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -73,6 +73,16 @@ define KernelPackage/ide-aec62xx endef $(eval $(call KernelPackage,ide-aec62xx)) +define KernelPackage/scsi-core + TITLE:=Kernel support for SCSI + SUBMENU:=$(EMENU) + KCONFIG:=$(CONFIG_BLK_DEV_SD) + FILES:= \ + $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \ + $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) +endef +$(eval $(call KernelPackage,scsi-core)) + define KernelPackage/lp TITLE:=Parallel port and line printer support KCONFIG:=$(CONFIG_PARPORT) diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 5c9b083016..d391f8b05b 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -233,10 +233,9 @@ define KernelPackage/usb-storage DESCRIPTION:=Kernel support for USB Mass Storage devices KCONFIG:=$(CONFIG_USB_STORAGE) FILES:= \ - $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) \ $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage) + DEPENDS:=+kmod-scsi-core endef $(eval $(call KernelPackage,usb-storage)) diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default index 6505eb23b5..e132fed864 100644 --- a/target/linux/x86-2.6/config/default +++ b/target/linux/x86-2.6/config/default @@ -19,6 +19,9 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y # CONFIG_ARLAN is not set # CONFIG_AT1700 is not set +CONFIG_ATA=m +# CONFIG_ATA_GENERIC is not set +CONFIG_ATA_PIIX=m # CONFIG_B44 is not set CONFIG_BASE_SMALL=0 # CONFIG_BINFMT_AOUT is not set @@ -289,6 +292,42 @@ CONFIG_NOHIGHMEM=y CONFIG_NSC_GPIO=m CONFIG_NVRAM=y CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CS5535 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_ISAPNP is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_LEGACY is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_QDI is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set # CONFIG_PC8736x_GPIO is not set # CONFIG_PCIEPORTBUS is not set # CONFIG_PCIPCWATCHDOG is not set @@ -300,6 +339,7 @@ CONFIG_PCI_GOANY=y # CONFIG_PCI_GOMMCONFIG is not set CONFIG_PCMCIA_PROBE=y # CONFIG_PCWATCHDOG is not set +# CONFIG_PDC_ADMA is not set CONFIG_PHYSICAL_START=0x100000 # CONFIG_PM is not set CONFIG_PNP=y @@ -308,6 +348,20 @@ CONFIG_PNP=y # CONFIG_REGPARM is not set CONFIG_RTC=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y +# CONFIG_SATA_AHCI is not set +CONFIG_SATA_INTEL_COMBINED=y +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_SVW is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set # CONFIG_SBC8360_WDT is not set # CONFIG_SBC_EPX_C3_WATCHDOG is not set CONFIG_SC1200_WDT=m @@ -324,6 +378,7 @@ CONFIG_SC1200_WDT=m # CONFIG_SCSI_GENERIC_NCR5380 is not set # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set # CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_IPR is not set # CONFIG_SCSI_NCR53C406A is not set # CONFIG_SCSI_PAS16 is not set # CONFIG_SCSI_PSI240I is not set