wpan: rework bluetooth / wpan and 6lowpan dependencies

- remove/rename of 6lowpan-iphc
upstream change in 3.17: 6lowpan: introduce new net/6lowpan directory
id: 2c6bed7cfcd3f594ed9e4d6919fa2ebea2243d19

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45529 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index a93583b..a7084c8 100644 (file)
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -10,25 +10,25 @@ OTHER_MENU:=Other modules
 WATCHDOG_DIR:=watchdog
 
 
 WATCHDOG_DIR:=watchdog
 
 

-define KernelPackage/6lowpan-iphc
-  USBMENU:=$(OTHER_MENU)
-  TITLE:=6lowpan shared code
-  KCONFIG:=CONFIG_6LOWPAN_IPHC
-  HIDDEN:=1
-  FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko
-  AUTOLOAD:=$(call Autoprobe,6lowpan_iphc)
+define KernelPackage/6lowpan
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=6LoWPAN shared code
+  KCONFIG:=CONFIG_6LOWPAN
+  FILES:=$(LINUX_DIR)/net/6lowpan/6lowpan.ko
+  AUTOLOAD:=$(call AutoProbe,6lowpan)

 endef
 
 endef
 

-define KernelPackage/6lowpan-iphc/description
+define KernelPackage/6lowpan/description

   Shared 6lowpan code for IEEE 802.15.4 and Bluetooth.
 endef
 
   Shared 6lowpan code for IEEE 802.15.4 and Bluetooth.
 endef
 

-$(eval $(call KernelPackage,6lowpan-iphc))
+$(eval $(call KernelPackage,6lowpan))
+

 
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
 
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support

-  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-6lowpan-iphc +kmod-lib-crc16 +kmod-hid
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-lib-crc16 +kmod-hid

   KCONFIG:= \
        CONFIG_BLUEZ \
        CONFIG_BLUEZ_L2CAP \
   KCONFIG:= \
        CONFIG_BLUEZ \
        CONFIG_BLUEZ_L2CAP \


@@ -70,13 +70,9 @@ $(eval $(call KernelPackage,bluetooth))
 define KernelPackage/bluetooth_6lowpan
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth 6LoWPAN support
 define KernelPackage/bluetooth_6lowpan
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth 6LoWPAN support

-  DEPENDS:=+kmod-bluetooth
-  KCONFIG:= \
-  CONFIG_6LOWPAN=m \
-  CONFIG_BT_6LOWPAN=m
-  FILES:= \
-       $(LINUX_DIR)/net/bluetooth/bluetooth_6lowpan.ko \
-       $(LINUX_DIR)/net/6lowpan/6lowpan.ko
+  DEPENDS:=+kmod-6lowpan +kmod-bluetooth
+  KCONFIG:=CONFIG_BT_6LOWPAN
+  FILES:=$(LINUX_DIR)/net/bluetooth/bluetooth_6lowpan.ko

        AUTOLOAD:=$(call AutoProbe,bluetooth)
 endef
 
        AUTOLOAD:=$(call AutoProbe,bluetooth)
 endef
 

diff --git a/package/kernel/linux/modules/wpan.mk b/package/kernel/linux/modules/wpan.mk
index 0b1f33a..f544f61 100644 (file)
--- a/package/kernel/linux/modules/wpan.mk
+++ b/package/kernel/linux/modules/wpan.mk
@@ -15,7 +15,7 @@ define KernelPackage/ieee802154
        CONFIG_IEEE802154_SOCKET=y
   FILES:= \
        $(LINUX_DIR)/net/ieee802154/ieee802154.ko \
        CONFIG_IEEE802154_SOCKET=y
   FILES:= \
        $(LINUX_DIR)/net/ieee802154/ieee802154.ko \

-       $(LINUX_DIR)/net/ieee802154/ieee802154_socket.ko
+       $(LINUX_DIR)/net/ieee802154/ieee802154_socket.ko@ge4.0

   AUTOLOAD:=$(call AutoLoad,90,ieee802154 ieee802154_socket)
 endef
 
   AUTOLOAD:=$(call AutoLoad,90,ieee802154 ieee802154_socket)
 endef
 


@@ -108,9 +108,11 @@ $(eval $(call KernelPackage,cc2520))
 define KernelPackage/ieee802154_6lowpan
   SUBMENU:=$(WPAN_MENU)
   TITLE:= 6LoWPAN support over IEEE-802.15.4
 define KernelPackage/ieee802154_6lowpan
   SUBMENU:=$(WPAN_MENU)
   TITLE:= 6LoWPAN support over IEEE-802.15.4

-  DEPENDS:=@LINUX_4_0
+  DEPENDS:=@LINUX_4_0 +kmod-6lowpan

   KCONFIG:=CONFIG_IEEE802154_6LOWPAN
   KCONFIG:=CONFIG_IEEE802154_6LOWPAN

-  FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan/ieee802154_6lowpan.ko
+  FILES:= \
+       $(LINUX_DIR)/net/ieee802154/6lowpan/ieee802154_6lowpan.ko@ge4.0 \
+       $(LINUX_DIR)/net/ieee802154/ieee802154_6lowpan.ko@lt4.0

   AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan)
 endef
 
   AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan)
 endef