Subject: [PATCH] Upgrades x86 to kernel 2.6.27 (#4195)

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

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 9e7c38f..98e58c5 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.


@@ -67,6 +67,24 @@ endef
 
 $(eval $(call KernelPackage,ata-ixp4xx-cf))
 
 
 $(eval $(call KernelPackage,ata-ixp4xx-cf))
 

+define KernelPackage/ata-rb532-cf
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=RB532 Compact Flash support
+  DEPENDS:=kmod-ata-core
+  KCONFIG:= \
+       CONFIG_PATA_PLATFORM \
+       CONFIG_PATA_RB532
+  FILES:=\
+       $(LINUX_DIR)/drivers/ata/pata_platform.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/drivers/ata/pata_rb532_cf.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,41,pata_platform pata_rb532_cf)
+endef
+
+define KernelPackage/ata-rb532-cf/description
+  RB532 Compact Flash support.
+endef
+
+$(eval $(call KernelPackage,ata-rb532-cf))

 
 define KernelPackage/ata-nvidia-sata
   SUBMENU:=$(BLOCK_MENU)
 
 define KernelPackage/ata-nvidia-sata
   SUBMENU:=$(BLOCK_MENU)


@@ -116,11 +134,12 @@ $(eval $(call KernelPackage,ata-via-sata))
 define KernelPackage/ide-core
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=IDE (ATA/ATAPI) device support
 define KernelPackage/ide-core
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=IDE (ATA/ATAPI) device support

+  DEPENDS:=@PCI_SUPPORT

   KCONFIG:= \
        CONFIG_IDE \
        CONFIG_IDE_GENERIC \
   KCONFIG:= \
        CONFIG_IDE \
        CONFIG_IDE_GENERIC \

+       CONFIG_BLK_DEV_GENERIC \

        CONFIG_BLK_DEV_IDE \
        CONFIG_BLK_DEV_IDE \

-       CONFIG_IDE_GENERIC \

        CONFIG_BLK_DEV_IDEDISK \
        CONFIG_BLK_DEV_IDEDMA_PCI=y \
        CONFIG_BLK_DEV_IDEPCI=y
        CONFIG_BLK_DEV_IDEDISK \
        CONFIG_BLK_DEV_IDEDMA_PCI=y \
        CONFIG_BLK_DEV_IDEPCI=y


@@ -135,10 +154,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)


@@ -167,6 +193,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