KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: move support for generic IDE chipsets out of ide-core in their own packages, fix ixp4xx build issue (closes: #6939)

Browse source 
SVN-Revision: 20664
This commit is contained in:
Nicolas Thill 2010-04-03 01:36:27 +00:00
parent 8be628f50a
commit 90888d6b35
1 changed files with 47 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
package/kernel/modules/block.mk
View file

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -193,8 +193,6 @@ define KernelPackage/ide-core
DEPENDS:=@PCI_SUPPORT DEPENDS:=@PCI_SUPPORT
KCONFIG:= \ KCONFIG:= \
CONFIG_IDE \ CONFIG_IDE \
CONFIG_IDE_GENERIC \
CONFIG_BLK_DEV_GENERIC \
CONFIG_BLK_DEV_IDE \ CONFIG_BLK_DEV_IDE \
CONFIG_BLK_DEV_IDEDISK \ CONFIG_BLK_DEV_IDEDISK \
CONFIG_IDE_GD \ CONFIG_IDE_GD \
@ -203,36 +201,26 @@ define KernelPackage/ide-core
CONFIG_BLK_DEV_IDEDMA_PCI=y \ CONFIG_BLK_DEV_IDEDMA_PCI=y \
CONFIG_BLK_DEV_IDEPCI=y CONFIG_BLK_DEV_IDEPCI=y
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX)
$(LINUX_DIR)/drivers/ide/ide-gd_mod.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:= \ AUTOLOAD:= \
$(call AutoLoad,20,ide-core,1) \ $(call AutoLoad,20,ide-core,1)
$(call AutoLoad,40,ide-gd_mod,1)
endef endef
define KernelPackage/ide-core/2.4 define KernelPackage/ide-core/2.4
FILES:= \ FILES+= \
$(LINUX_DIR)/drivers/ide/ide-core.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/ide/ide-detect.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/ide/ide-disk.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:= \ AUTOLOAD+= \
$(call AutoLoad,20,ide-core,1) \
$(call AutoLoad,35,ide-detect,1) \ $(call AutoLoad,35,ide-detect,1) \
$(call AutoLoad,40,ide-disk,1) $(call AutoLoad,40,ide-disk,1)
endef endef
ifneq ($(CONFIG_arm)$(CONFIG_powerpc),y)
define KernelPackage/ide-core/2.6 define KernelPackage/ide-core/2.6
ifeq ($(CONFIG_PCI_SUPPORT),y) FILES+= \
FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/ide/ide-gd_mod.$(LINUX_KMOD_SUFFIX)
$(LINUX_DIR)/drivers/ide/ide-pci-generic.$(LINUX_KMOD_SUFFIX) AUTOLOAD+= \
AUTOLOAD+=$(call AutoLoad,30,ide-generic ide-pci-generic,1) $(call AutoLoad,40,ide-gd_mod,1)
else
FILES+=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX)
AUTOLOAD+=$(call AutoLoad,30,ide-generic,1)
endif
endef endef
endif
define KernelPackage/ide-core/description define KernelPackage/ide-core/description
Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD) Kernel support for IDE, useful for usb mass storage devices (e.g. on WL-HDD)
@ -251,6 +239,42 @@ define KernelPackage/ide/Depends
endef 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 define KernelPackage/ide-aec62xx
$(call KernelPackage/ide/Depends,@PCI_SUPPORT) $(call KernelPackage/ide/Depends,@PCI_SUPPORT)
TITLE:=Acard AEC62xx IDE driver TITLE:=Acard AEC62xx IDE driver