Merge branch 'master' into ieee

This commit is contained in:
Sebastien Lorquet
2017-03-13 16:51:05 +01:00
446 changed files with 41408 additions and 10027 deletions
+2 -2
View File
@@ -3,12 +3,12 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
config IEEE802154
config WIRELESS_IEEE802154
bool "IEEE 802.15.4 Wireless Support"
default n
depends on EXPERIMENTAL
---help---
Enables support for the IEEE 802.14.5Wireless library.
Enables support for the IEEE 802.14.5 Wireless library.
if IEEE802154
+2 -2
View File
@@ -33,7 +33,7 @@
#
############################################################################
ifeq ($(CONFIG_IEEE802154),y)
ifeq ($(CONFIG_WIRELESS_IEEE802154),y)
# Include IEEE 802.15.4 support
CSRCS =
@@ -52,4 +52,4 @@ DEPPATH += --dep-path wireless/ieee802154
VPATH += :wireless/ieee802154
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154}
endif # CONFIG_IEEE802154
endif # CONFIG_WIRELESS_IEEE802154