aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/modules
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-04-03 01:36:27 +0000
committerNicolas Thill <nico@openwrt.org>2010-04-03 01:36:27 +0000
commit90888d6b35e3253d2409ca974a7343c000fcf877 (patch)
tree8862fe726e3621a5261cef96f47360bf028de2fc /package/kernel/modules
parent8be628f50a9626ad6a3b44df9f1b84dc4e01394f (diff)
downloadupstream-90888d6b35e3253d2409ca974a7343c000fcf877.tar.gz
upstream-90888d6b35e3253d2409ca974a7343c000fcf877.tar.bz2
upstream-90888d6b35e3253d2409ca974a7343c000fcf877.zip
kernel: move support for generic IDE chipsets out of ide-core in their own packages, fix ixp4xx build issue (closes: #6939)
SVN-Revision: 20664
Diffstat (limited to 'package/kernel/modules')
-rw-r--r--package/kernel/modules/block.mk70
1 files changed, 47 insertions, 23 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index db46242849..7f3686d35e 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -193,8 +193,6 @@ define KernelPackage/ide-core
DEPENDS:=@PCI_SUPPORT
KCONFIG:= \
CONFIG_IDE \
- CONFIG_IDE_GENERIC \
- CONFIG_BLK_DEV_GENERIC \
CONFIG_BLK_DEV_IDE \
CONFIG_BLK_DEV_IDEDISK \
CONFIG_IDE_GD \
@@ -203,36 +201,26 @@ define KernelPackage/ide-core
CONFIG_BLK_DEV_IDEDMA_PCI=y \
CONFIG_BLK_DEV_IDEPCI=y
FILES:= \
- $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/ide/ide-gd_mod.$(LINUX_KMOD_SUFFIX)
+ $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:= \
- $(call AutoLoad,20,ide-core,1) \
- $(call AutoLoad,40,ide-gd_mod,1)
+ $(call AutoLoad,20,ide-core,1)
endef
define KernelPackage/ide-core/2.4
- FILES:= \
- $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
+ FILES+= \
$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:= \
- $(call AutoLoad,20,ide-core,1) \
+ AUTOLOAD+= \
$(call AutoLoad,35,ide-detect,1) \
$(call AutoLoad,40,ide-disk,1)
endef
-ifneq ($(CONFIG_arm)$(CONFIG_powerpc),y)
- define KernelPackage/ide-core/2.6
- ifeq ($(CONFIG_PCI_SUPPORT),y)
- FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/ide/ide-pci-generic.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD+=$(call AutoLoad,30,ide-generic ide-pci-generic,1)
- else
- FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD+=$(call AutoLoad,30,ide-generic,1)
- endif
- endef
-endif
+define KernelPackage/ide-core/2.6
+ FILES+= \
+ $(LINUX_DIR)/drivers/ide/ide-gd_mod.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD+= \
+ $(call AutoLoad,40,ide-gd_mod,1)
+endef
define KernelPackage/ide-core/description
Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)
@@ -251,6 +239,42 @@ define KernelPackage/ide/Depends
endef
+define KernelPackage/ide-generic
+$(call KernelPackage/ide/Depends,@PCI_SUPPORT)
+ SUBMENU:=$(BLOCK_MENU)
+ TITLE:=Kernel support for generic PCI IDE chipsets
+ KCONFIG:=CONFIG_BLK_DEV_GENERIC
+endef
+
+define KernelPackage/ide-generic/2.4
+ FILES+= \
+ $(LINUX_DIR)/drivers/ide/pci/generic.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD+= \
+ $(call AutoLoad,30,generic,1)
+endef
+
+define KernelPackage/ide-generic/2.6
+ FILES+= \
+ $(LINUX_DIR)/drivers/ide/ide-pci-generic.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD+= \
+ $(call AutoLoad,30,ide-pci-generic,1)
+endef
+
+$(eval $(call KernelPackage,ide-generic))
+
+
+define KernelPackage/ide-generic-old
+$(call KernelPackage/ide/Depends,@LINUX_2_6)
+ SUBMENU:=$(BLOCK_MENU)
+ TITLE:=Kernel support for generic (legacy) IDE chipsets
+ KCONFIG:=CONFIG_IDE_GENERIC
+ FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
+ AUTOLOAD:=$(call AutoLoad,30,ide-generic,1)
+endef
+
+$(eval $(call KernelPackage,ide-generic-old))
+
+
define KernelPackage/ide-aec62xx
$(call KernelPackage/ide/Depends,@PCI_SUPPORT)
TITLE:=Acard AEC62xx IDE driver