brcm-2.4: fix ide disk detection on the wl-hdd

[openwrt.git] / package / kernel / modules / block.mk

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 2d14e42..3fa7b1c 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -113,6 +113,24 @@ endef
 $(eval $(call KernelPackage,ata-nvidia-sata))
 
 
+define KernelPackage/ata-magicbox-cf
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Magicbox v2/OpenRB Compact flash support (ATA)
+  DEPENDS:=@TARGET_ppc40x +kmod-ata-core
+  KCONFIG:=\
+       CONFIG_PATA_MAGICBOX_CF \
+       CONFIG_ATA_SFF=y
+  FILES:=$(LINUX_DIR)/drivers/ata/pata_magicbox_cf.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,41,pata_magicbox_cf)
+endef
+
+define KernelPackage/ata-magicbox-cf/description
+  Support for Magicbox v2/OpenRB on-board CF slot. (ATA version).
+endef
+
+$(eval $(call KernelPackage,ata-magicbox-cf))
+
+
 define KernelPackage/ata-piix
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Intel PIIX PATA/SATA support
@@ -176,10 +194,10 @@ endef
 
 define KernelPackage/ide-core/2.4
   FILES+=$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD+=$(call AutoLoad,30,ide-detect)
+  AUTOLOAD+=$(call AutoLoad,35,ide-detect)
 endef
 
-ifneq ($(CONFIG_arm),y)
+ifneq ($(CONFIG_arm)$(CONFIG_powerpc),y)
   define KernelPackage/ide-core/2.6
     FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
     AUTOLOAD+=$(call AutoLoad,30,ide-generic)
@@ -219,15 +237,15 @@ $(eval $(call KernelPackage,ide-aec62xx))
 
 define KernelPackage/ide-magicbox
   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)
+  TITLE:=Magicbox v2/OpenRB Compact flash support (IDE)
+  DEPENDS:=@TARGET_ppc40x +kmod-ide-core
+  KCONFIG:=CONFIG_BLK_DEV_IDE_MAGICBOX
+  FILES:=$(LINUX_DIR)/drivers/ide/magicbox_ide.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,magicbox_ide)
 endef
 
 define KernelPackage/ide-magicbox/description
- Support for Magicbox 2.0 onboard CF slot.
+ Support for Magicbox v2/OpenRB on-board CF slot. (IDE version).
 endef
 
 $(eval $(call KernelPackage,ide-magicbox))
@@ -389,3 +407,36 @@ define KernelPackage/axonram/description
 endef
 
 $(eval $(call KernelPackage,axonram))
+
+define KernelPackage/libsas
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=SAS Domain Transport Attributes
+  DEPENDS:=+kmod-scsi-core @TARGET_x86
+  KCONFIG:=CONFIG_SCSI_SAS_LIBSAS \
+       CONFIG_SCSI_SAS_ATA=y \
+       CONFIG_SCSI_SAS_HOST_SMP=y \
+       CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
+  FILES:=$(LINUX_DIR)/drivers/scsi/libsas/libsas.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,29,libsas)
+endef
+
+define KernelPackage/libsas/description
+  SAS Domain Transport Attributes support.
+endef
+
+$(eval $(call KernelPackage,libsas))
+
+define KernelPackage/mvsas
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Marvell 88SE6440 SAS/SATA driver
+  DEPENDS:=@TARGET_x86 +kmod-libsas
+  KCONFIG:=CONFIG_SCSI_MVSAS
+  FILES:=$(LINUX_DIR)/drivers/scsi/mvsas.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,mvsas)
+endef
+
+define KernelPackage/mvsas/description
+  Kernel support for the Marvell SAS SCSI adapters
+endef
+
+$(eval $(call KernelPackage,mvsas))