deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd

Browse source
This commit is contained in:
Harald Pichler 2015-01-16 20:14:07 +01:00
parent 4b9314cbde b3bf194b88
commit 64e3ed0281
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platform/osd-merkur/Makefile.osd-merkur
View file

@ -67,9 +67,8 @@ LDFLAGS += -Wl,--defsym,bootloader_get_mac=$(BOOTLOADER_GET_MAC)
include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio include $(CONTIKIAVR)/radio/Makefile.radio
MODULES += core/net/mac core/net core/net/mac/sicslowmac \ MODULES += core/net/mac core/net core/net/mac/sicslowmac core/net/mac/contikimac \
core/net/llsec \ # core/net/llsec \
core/net/mac/contikimac \
# core/net/ipv6 core/net/ipv4 core/net/ip \ # core/net/ipv6 core/net/ipv4 core/net/ip \
# core/net/rime \ # core/net/rime \
# core/net/rpl \ # core/net/rpl \