fix ImageBuilder (closes: #3863)

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

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index db5f352..bf327e1 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -68,11 +68,22 @@ endef
 $(eval $(call KernelPackage,ata-ixp4xx-cf))
 
 
 $(eval $(call KernelPackage,ata-ixp4xx-cf))
 
 

+define KernelPackage/ata-nvidia-sata
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Nvidia Serial ATA 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)
+endef
+
+$(eval $(call KernelPackage,ata-nvidia-sata))
+

 
 define KernelPackage/ata-piix
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Intel PIIX PATA/SATA support
 
 define KernelPackage/ata-piix
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Intel PIIX PATA/SATA support

-  DEPENDS:=kmod-ata-core +kmod-ide-core
+  DEPENDS:=kmod-ata-core

   KCONFIG:=CONFIG_ATA_PIIX
   FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,ata_piix)
   KCONFIG:=CONFIG_ATA_PIIX
   FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,41,ata_piix)


@@ -108,6 +119,7 @@ define KernelPackage/ide-core
   KCONFIG:= \
        CONFIG_IDE \
        CONFIG_IDE_GENERIC \
   KCONFIG:= \
        CONFIG_IDE \
        CONFIG_IDE_GENERIC \

+       CONFIG_BLK_DEV_GENERIC \

        CONFIG_BLK_DEV_IDE \
        CONFIG_IDE_GENERIC \
        CONFIG_BLK_DEV_IDEDISK \
        CONFIG_BLK_DEV_IDE \
        CONFIG_IDE_GENERIC \
        CONFIG_BLK_DEV_IDEDISK \


@@ -124,10 +136,17 @@ define KernelPackage/ide-core/2.4
   AUTOLOAD+=$(call AutoLoad,30,ide-detect)
 endef
 
   AUTOLOAD+=$(call AutoLoad,30,ide-detect)
 endef
 

-define KernelPackage/ide-core/2.6
-  FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD+=$(call AutoLoad,30,ide-generic)
-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

 
 define KernelPackage/ide-core/description
  Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)
 
 define KernelPackage/ide-core/description
  Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)


@@ -156,6 +175,22 @@ endef
 $(eval $(call KernelPackage,ide-aec62xx))
 
 
 $(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)
+  AUTOLOAD:=$(call AutoLoad,30,magicbox_ide)
+endef
+
+define KernelPackage/ide-magicbox/description
+ Support for Magicbox 2.0 onboard CF slot.
+endef
+
+$(eval $(call KernelPackage,ide-magicbox))
+
+

 define KernelPackage/ide-pdc202xx
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Promise PDC202xx IDE driver
 define KernelPackage/ide-pdc202xx
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Promise PDC202xx IDE driver