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

Merge pull request #228 from g-oikonomou/bug-fixes/uip-conf-ipv6

Browse source 
Fix 8051 port builds to play nicely with #173
This commit is contained in:
Mariano Alvira 2013-05-18 15:36:59 -07:00
parent 87a995374b 13e29c7975
commit 26d81d85a1
4 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
platform/cc2530dk/Makefile.cc2530dk
View file

@ -20,6 +20,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
CLEAN += *.cc2530dk
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DUIP_CONF_IPV6=1
CONTIKI_TARGET_SOURCEFILES += viztool.c
endif

10
platform/cc2530dk/contiki-conf.h
View file

@ -203,11 +203,6 @@
#define UIP_CONF_ROUTER 1
#endif
/* Prevent SDCC compile error when UIP_CONF_ROUTER == 0 */
#if !UIP_CONF_ROUTER
#define UIP_CONF_DS6_AADDR_NBU 1
#endif
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_IP_FORWARD 0
#define RPL_CONF_STATS 0
@ -257,4 +252,9 @@
#define QUEUEBUF_CONF_NUM 8
#endif /* UIP_CONF_IPV6 */
/* Prevent SDCC compile error when UIP_CONF_ROUTER == 0 */
#if !UIP_CONF_ROUTER
#define UIP_CONF_DS6_AADDR_NBU 1
#endif
#endif /* __CONTIKI_CONF_H__ */

1
platform/sensinode/Makefile.sensinode
View file

@ -47,6 +47,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
CLEAN += *.sensinode
ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DUIP_CONF_IPV6=1
ifeq ($(OFFSET_FIRMWARE),1)
CFLAGS += -DDISCO_ENABLED=1
CONTIKI_TARGET_SOURCEFILES += disco.c

10
platform/sensinode/contiki-conf.h
View file

@ -209,11 +209,6 @@
#define UIP_CONF_ROUTER 1
#endif
/* Prevent SDCC compile error when UIP_CONF_ROUTER == 0 */
#if !UIP_CONF_ROUTER
#define UIP_CONF_DS6_AADDR_NBU 1
#endif
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_IP_FORWARD 0
#define RPL_CONF_STATS 0
@ -281,4 +276,9 @@
#define QUEUEBUF_CONF_NUM 8
#endif /* UIP_CONF_IPV6 */
/* Prevent SDCC compile error when UIP_CONF_ROUTER == 0 */
#if !UIP_CONF_ROUTER
#define UIP_CONF_DS6_AADDR_NBU 1
#endif
#endif /* __CONTIKI_CONF_H__ */