From: jogo Date: Tue, 2 Aug 2011 09:53:19 +0000 (+0000) Subject: kernel: Fix firewire for 2.6.37+ X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/2120753685a36807f6ff224b81c98bda689d1336 kernel: Fix firewire for 2.6.37+ The old ieee1394 stack was removed in 2.6.37. The new firewire stack is available for all kernel versions, but experimental for the older one, so make both available where appropriate. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27874 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/kernel/modules/firewire.mk b/package/kernel/modules/firewire.mk index 60908a0eb..10d144ce7 100644 --- a/package/kernel/modules/firewire.mk +++ b/package/kernel/modules/firewire.mk @@ -15,15 +15,15 @@ endef define KernelPackage/ieee1394 SUBMENU:=$(FIREWIRE_MENU) - TITLE:=Support for FireWire - DEPENDS:=@PCI_SUPPORT + TITLE:=Support for FireWire (old stack) + DEPENDS:=@PCI_SUPPORT @LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36 KCONFIG:=CONFIG_IEEE1394 FILES:=$(LINUX_DIR)/drivers/ieee1394/ieee1394.ko AUTOLOAD:=$(call AutoLoad,20,ieee1394) endef define KernelPackage/ieee1394/description - Kernel support for FireWire + Kernel support for FireWire (old stack) endef $(eval $(call KernelPackage,ieee1394)) @@ -90,3 +90,71 @@ endef $(eval $(call KernelPackage,video1394)) + +define KernelPackage/firewire + SUBMENU:=$(FIREWIRE_MENU) + TITLE:=Support for FireWire (new stack) + DEPENDS:=@PCI_SUPPORT + KCONFIG:=CONFIG_FIREWIRE + FILES:=$(LINUX_DIR)/drivers/firewire/firewire-core.ko + AUTOLOAD:=$(call AutoLoad,20,firewire-core) +endef + +define KernelPackage/firewire/description + Kernel support for FireWire (new stack) +endef + +$(eval $(call KernelPackage,firewire)) + + +define KernelPackage/firewire-ohci + SUBMENU:=$(FIREWIRE_MENU) + TITLE:=Support for OHCI-1394 controllers + DEPENDS:=kmod-firewire + KCONFIG:= \ + CONFIG_FIREWIRE_OHCI \ + CONFIG_FIREWIRE_OHCI_DEBUG=n \ + CONFIG_FIREWIRE_OHCI_REMOTE_DMA=n + FILES:=$(LINUX_DIR)/drivers/firewire/firewire-ohci.ko + AUTOLOAD:=$(call AutoLoad,50,firewire-ohci) +endef + + +define KernelPackage/firewire-ohci/description + Kernel support for FireWire OHCI-1394 controllers +endef + +$(eval $(call KernelPackage,firewire-ohci)) + + +define KernelPackage/firewire-sbp2 + SUBMENU:=$(FIREWIRE_MENU) + TITLE:=Support for SBP-2 devices over FireWire + DEPENDS:=kmod-firewire +!TARGET_x86:kmod-scsi-core + KCONFIG:=CONFIG_FIREWIRE_SBP2 + FILES:=$(LINUX_DIR)/drivers/firewire/firewire-sbp2.ko + AUTOLOAD:=$(call AutoLoad,50,firewire-sbp2) +endef + +define KernelPackage/firewire-sbp2/description + Kernel support for SBP-2 devices over FireWire +endef + +$(eval $(call KernelPackage,firewire-sbp2)) + + +define KernelPackage/firewire-net + SUBMENU:=$(FIREWIRE_MENU) + TITLE:=Support for IP networking over FireWire + DEPENDS:=kmod-firewire @!LINUX_2_6_30 + KCONFIG:=CONFIG_FIREWIRE_NET + FILES:=$(LINUX_DIR)/drivers/firewire/firewire-net.ko + AUTOLOAD:=$(call AutoLoad,50,firewire-net) +endef + +define KernelPackage/firewire-net/description + Kernel support for IPv4 over FireWire +endef + +$(eval $(call KernelPackage,firewire-net)) + diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37 index 2fe4d1aff..eaf631eb2 100644 --- a/target/linux/generic/config-2.6.37 +++ b/target/linux/generic/config-2.6.37 @@ -890,14 +890,6 @@ CONFIG_HZ_100=y CONFIG_IDE_PROC_FS=y # CONFIG_IDE_TASK_IOCTL is not set # CONFIG_IDEAPAD_LAPTOP is not set -# CONFIG_IEEE1394 is not set -# CONFIG_IEEE1394_DV1394 is not set -# CONFIG_IEEE1394_ETH1394 is not set -# CONFIG_IEEE1394_OHCI1394 is not set -# CONFIG_IEEE1394_PCILYNX is not set -# CONFIG_IEEE1394_RAWIO is not set -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -# CONFIG_IEEE1394_VIDEO1394 is not set # CONFIG_IEEE802154 is not set # CONFIG_IFB is not set # CONFIG_IGB is not set diff --git a/target/linux/generic/config-2.6.38 b/target/linux/generic/config-2.6.38 index 7f438de7d..8ad37bf89 100644 --- a/target/linux/generic/config-2.6.38 +++ b/target/linux/generic/config-2.6.38 @@ -913,14 +913,6 @@ CONFIG_HZ_100=y CONFIG_IDE_PROC_FS=y # CONFIG_IDE_TASK_IOCTL is not set # CONFIG_IDEAPAD_LAPTOP is not set -# CONFIG_IEEE1394 is not set -# CONFIG_IEEE1394_DV1394 is not set -# CONFIG_IEEE1394_ETH1394 is not set -# CONFIG_IEEE1394_OHCI1394 is not set -# CONFIG_IEEE1394_PCILYNX is not set -# CONFIG_IEEE1394_RAWIO is not set -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -# CONFIG_IEEE1394_VIDEO1394 is not set # CONFIG_IEEE802154 is not set # CONFIG_IFB is not set # CONFIG_IGB is not set diff --git a/target/linux/generic/config-2.6.39 b/target/linux/generic/config-2.6.39 index 9b8279261..411cafd49 100644 --- a/target/linux/generic/config-2.6.39 +++ b/target/linux/generic/config-2.6.39 @@ -928,14 +928,6 @@ CONFIG_HZ_100=y CONFIG_IDE_PROC_FS=y # CONFIG_IDE_TASK_IOCTL is not set # CONFIG_IDEAPAD_LAPTOP is not set -# CONFIG_IEEE1394 is not set -# CONFIG_IEEE1394_DV1394 is not set -# CONFIG_IEEE1394_ETH1394 is not set -# CONFIG_IEEE1394_OHCI1394 is not set -# CONFIG_IEEE1394_PCILYNX is not set -# CONFIG_IEEE1394_RAWIO is not set -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -# CONFIG_IEEE1394_VIDEO1394 is not set # CONFIG_IEEE802154 is not set # CONFIG_IFB is not set # CONFIG_IGB is not set diff --git a/target/linux/generic/config-3.0 b/target/linux/generic/config-3.0 index 30f84d931..cacbb1ebe 100644 --- a/target/linux/generic/config-3.0 +++ b/target/linux/generic/config-3.0 @@ -939,14 +939,6 @@ CONFIG_HZ_100=y CONFIG_IDE_PROC_FS=y # CONFIG_IDE_TASK_IOCTL is not set # CONFIG_IDEAPAD_LAPTOP is not set -# CONFIG_IEEE1394 is not set -# CONFIG_IEEE1394_DV1394 is not set -# CONFIG_IEEE1394_ETH1394 is not set -# CONFIG_IEEE1394_OHCI1394 is not set -# CONFIG_IEEE1394_PCILYNX is not set -# CONFIG_IEEE1394_RAWIO is not set -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -# CONFIG_IEEE1394_VIDEO1394 is not set # CONFIG_IEEE802154 is not set # CONFIG_IFB is not set # CONFIG_IGB is not set