[ppc40x] update dts of Magicbox V2

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

diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 3ef15c9..06dc0a3 100644 (file)
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -179,12 +179,7 @@ define KernelPackage/ide-core/2.4
   AUTOLOAD+=$(call AutoLoad,30,ide-detect)
 endef
 
   AUTOLOAD+=$(call AutoLoad,30,ide-detect)
 endef
 

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


@@ -225,9 +220,9 @@ $(eval $(call KernelPackage,ide-aec62xx))
 define KernelPackage/ide-magicbox
   SUBMENU:=$(BLOCK_MENU)
   TITLE:=Magicbox 2.0 IDE CF driver
 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)
+  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
 
   AUTOLOAD:=$(call AutoLoad,30,magicbox_ide)
 endef
 


@@ -260,8 +255,12 @@ define KernelPackage/ide-it821x
   TITLE:=ITE IT821x IDE driver
   DEPENDS:=+kmod-ide-core
   KCONFIG:=CONFIG_BLK_DEV_IT821X
   TITLE:=ITE IT821x IDE driver
   DEPENDS:=+kmod-ide-core
   KCONFIG:=CONFIG_BLK_DEV_IT821X

+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1)

   FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX)
   FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,30,ite821x)
+else
+  FILES=$(LINUX_DIR)/drivers/ide/pci/it821x.$(LINUX_KMOD_SUFFIX)
+endif
+  AUTOLOAD:=$(call AutoLoad,30,it821x)

 endef
 
 define KernelPackage/ide-it821x/description
 endef
 
 define KernelPackage/ide-it821x/description


@@ -375,3 +374,18 @@ define KernelPackage/ps3vram/description
 endef
 
 $(eval $(call KernelPackage,ps3vram))
 endef
 
 $(eval $(call KernelPackage,ps3vram))

+
+define KernelPackage/axonram
+  SUBMENU:=$(BLOCK_MENU)
+  TITLE:=Axon DDR2 memory device driver
+  DEPENDS:=@TARGET_pxcab
+  KCONFIG:=CONFIG_AXON_RAM
+  FILES:=$(LINUX_DIR)/arch/powerpc/sysdev/axonram.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,01,axonram)
+endef
+
+define KernelPackage/axonram/description
+  Kernel support for Axon DDR2 memory device
+endef
+
+$(eval $(call KernelPackage,axonram))