X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Ffirewire.mk;h=34edf0c5113bf3cbbf022761598400ac7ee3bf8f;hb=29ccabae44e01c288b1d2aaf1bb0236846e0da89;hp=00486fb4ce09002ed34bf4a69ff2f863f616609d;hpb=dec6a89589d06bfce3fc061ba8cf046b8f56fc7c;p=oweals%2Fopenwrt.git

diff --git a/package/kernel/modules/firewire.mk b/package/kernel/modules/firewire.mk
index 00486fb4ce..34edf0c511 100644
--- a/package/kernel/modules/firewire.mk
+++ b/package/kernel/modules/firewire.mk
@@ -1,91 +1,77 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 FIREWIRE_MENU:=FireWire support
 
-define firewiredep
-  SUBMENU:=$(FIREWIRE_MENU)
-  DEPENDS:=kmod-ieee1394 $(1)
-endef
 
-
-define KernelPackage/ieee1394
+define KernelPackage/firewire
   SUBMENU:=$(FIREWIRE_MENU)
-  TITLE:=Support for FireWire
-  DEPENDS:=@PCI_SUPPORT
-  KCONFIG:=CONFIG_IEEE1394
-  FILES:=$(LINUX_DIR)/drivers/ieee1394/ieee1394.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,ieee1394)
+  TITLE:=Support for FireWire (new stack)
+  DEPENDS:=@PCI_SUPPORT +kmod-lib-crc-itu-t
+  KCONFIG:=CONFIG_FIREWIRE
+  FILES:=$(LINUX_DIR)/drivers/firewire/firewire-core.ko
+  AUTOLOAD:=$(call AutoLoad,20,firewire-core)
 endef
 
-define KernelPackage/ieee1394/description
- Kernel support for FireWire
+define KernelPackage/firewire/description
+  Kernel support for FireWire (new stack)
 endef
 
-$(eval $(call KernelPackage,ieee1394))
+$(eval $(call KernelPackage,firewire))
 
 
-define KernelPackage/ohci1394
-  $(call firewiredep,)
+define KernelPackage/firewire-ohci
+  SUBMENU:=$(FIREWIRE_MENU)
   TITLE:=Support for OHCI-1394 controllers
-  KCONFIG:= CONFIG_IEEE1394_OHCI1394
-  FILES:=$(LINUX_DIR)/drivers/ieee1394/ohci1394.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,ohci1394)
+  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/ohci1394/description
+
+define KernelPackage/firewire-ohci/description
  Kernel support for FireWire OHCI-1394 controllers
 endef
 
-$(eval $(call KernelPackage,ohci1394))
+$(eval $(call KernelPackage,firewire-ohci))
 
 
-define KernelPackage/sbp2
-  $(call firewiredep,kmod-ohci1394)
+define KernelPackage/firewire-sbp2
+  SUBMENU:=$(FIREWIRE_MENU)
   TITLE:=Support for SBP-2 devices over FireWire
-  KCONFIG:=CONFIG_IEEE1394_SBP2
-  FILES:=$(LINUX_DIR)/drivers/ieee1394/sbp2.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,sbp2)
+  DEPENDS:=kmod-firewire +kmod-scsi-core
+  KCONFIG:=CONFIG_FIREWIRE_SBP2
+  FILES:=$(LINUX_DIR)/drivers/firewire/firewire-sbp2.ko
+  AUTOLOAD:=$(call AutoLoad,50,firewire-sbp2)
 endef
 
-define KernelPackage/sbp2/description
+define KernelPackage/firewire-sbp2/description
  Kernel support for SBP-2 devices over FireWire
 endef
 
-$(eval $(call KernelPackage,sbp2))
+$(eval $(call KernelPackage,firewire-sbp2))
 
 
-define KernelPackage/raw1394
-  $(call firewiredep,kmod-ohci1394)
-  TITLE:=Support for Raw I/O for FireWire devices
-  KCONFIG:=CONFIG_IEEE1394_RAWIO
-  FILES:=$(LINUX_DIR)/drivers/ieee1394/raw1394.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,raw1394)
-endef
-
-define KernelPackage/raw1394/description
- Kernel support for FireWire Raw I/O
-endef
-
-$(eval $(call KernelPackage,raw1394))
-
-
-define KernelPackage/video1394
-  $(call firewiredep,kmod-ohci1394)
-  TITLE:=Support for FireWire video
-  KCONFIG:=CONFIG_IEEE1394_VIDEO1394
-  FILES:=$(LINUX_DIR)/drivers/ieee1394/video1394.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,50,video1394)
+define KernelPackage/firewire-net
+  SUBMENU:=$(FIREWIRE_MENU)
+  TITLE:=Support for IP networking over FireWire
+  DEPENDS:=kmod-firewire
+  KCONFIG:=CONFIG_FIREWIRE_NET
+  FILES:=$(LINUX_DIR)/drivers/firewire/firewire-net.ko
+  AUTOLOAD:=$(call AutoLoad,50,firewire-net)
 endef
 
-define KernelPackage/video1394/description
- Kernel support for FireWire video
+define KernelPackage/firewire-net/description
+ Kernel support for IPv4 over FireWire
 endef
 
-$(eval $(call KernelPackage,video1394))
+$(eval $(call KernelPackage,firewire-net))