Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wpan: rework bluetooth / wpan and 6lowpan dependencies

Browse source 
- 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>

SVN-Revision: 45529
This commit is contained in:
John Crispin 2015-04-21 06:59:10 +00:00
parent 48d81861a6
commit 87ef12fad3
2 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
package/kernel/linux/modules/other.mk
View file

@ -10,25 +10,25 @@ OTHER_MENU:=Other modules
WATCHDOG_DIR:=watchdog WATCHDOG_DIR:=watchdog
define KernelPackage/6lowpan-iphc define KernelPackage/6lowpan
USBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=6lowpan shared code TITLE:=6LoWPAN shared code
KCONFIG:=CONFIG_6LOWPAN_IPHC KCONFIG:=CONFIG_6LOWPAN
HIDDEN:=1 FILES:=$(LINUX_DIR)/net/6lowpan/6lowpan.ko
FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko AUTOLOAD:=$(call AutoProbe,6lowpan)
AUTOLOAD:=$(call Autoprobe,6lowpan_iphc)
endef endef
define KernelPackage/6lowpan-iphc/description define KernelPackage/6lowpan/description
Shared 6lowpan code for IEEE 802.15.4 and Bluetooth. Shared 6lowpan code for IEEE 802.15.4 and Bluetooth.
endef endef
$(eval $(call KernelPackage,6lowpan-iphc)) $(eval $(call KernelPackage,6lowpan))
define KernelPackage/bluetooth define KernelPackage/bluetooth
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth support 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:= \ KCONFIG:= \
CONFIG_BLUEZ \ CONFIG_BLUEZ \
CONFIG_BLUEZ_L2CAP \ CONFIG_BLUEZ_L2CAP \
@ -70,13 +70,9 @@ $(eval $(call KernelPackage,bluetooth))
define KernelPackage/bluetooth_6lowpan define KernelPackage/bluetooth_6lowpan
SUBMENU:=$(OTHER_MENU) SUBMENU:=$(OTHER_MENU)
TITLE:=Bluetooth 6LoWPAN support TITLE:=Bluetooth 6LoWPAN support
DEPENDS:=+kmod-bluetooth DEPENDS:=+kmod-6lowpan +kmod-bluetooth
KCONFIG:= \ KCONFIG:=CONFIG_BT_6LOWPAN
CONFIG_6LOWPAN=m \ FILES:=$(LINUX_DIR)/net/bluetooth/bluetooth_6lowpan.ko
CONFIG_BT_6LOWPAN=m
FILES:= \
$(LINUX_DIR)/net/bluetooth/bluetooth_6lowpan.ko \
$(LINUX_DIR)/net/6lowpan/6lowpan.ko
AUTOLOAD:=$(call AutoProbe,bluetooth) AUTOLOAD:=$(call AutoProbe,bluetooth)
endef endef

8
package/kernel/linux/modules/wpan.mk
View file

@ -15,7 +15,7 @@ define KernelPackage/ieee802154
CONFIG_IEEE802154_SOCKET=y CONFIG_IEEE802154_SOCKET=y
FILES:= \ FILES:= \
$(LINUX_DIR)/net/ieee802154/ieee802154.ko \ $(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) AUTOLOAD:=$(call AutoLoad,90,ieee802154 ieee802154_socket)
endef endef
@ -108,9 +108,11 @@ $(eval $(call KernelPackage,cc2520))
define KernelPackage/ieee802154_6lowpan define KernelPackage/ieee802154_6lowpan
SUBMENU:=$(WPAN_MENU) SUBMENU:=$(WPAN_MENU)
TITLE:= 6LoWPAN support over IEEE-802.15.4 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) AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan)
endef endef