mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-09 23:54:32 +00:00
Merge pull request #228 from g-oikonomou/bug-fixes/uip-conf-ipv6
Fix 8051 port builds to play nicely with #173
This commit is contained in:
commit
26d81d85a1
@ -20,6 +20,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
|
|||||||
CLEAN += *.cc2530dk
|
CLEAN += *.cc2530dk
|
||||||
|
|
||||||
ifeq ($(UIP_CONF_IPV6),1)
|
ifeq ($(UIP_CONF_IPV6),1)
|
||||||
|
CFLAGS += -DUIP_CONF_IPV6=1
|
||||||
CONTIKI_TARGET_SOURCEFILES += viztool.c
|
CONTIKI_TARGET_SOURCEFILES += viztool.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -203,11 +203,6 @@
|
|||||||
#define UIP_CONF_ROUTER 1
|
#define UIP_CONF_ROUTER 1
|
||||||
#endif
|
#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_ND6_SEND_RA 0
|
||||||
#define UIP_CONF_IP_FORWARD 0
|
#define UIP_CONF_IP_FORWARD 0
|
||||||
#define RPL_CONF_STATS 0
|
#define RPL_CONF_STATS 0
|
||||||
@ -257,4 +252,9 @@
|
|||||||
#define QUEUEBUF_CONF_NUM 8
|
#define QUEUEBUF_CONF_NUM 8
|
||||||
#endif /* UIP_CONF_IPV6 */
|
#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__ */
|
#endif /* __CONTIKI_CONF_H__ */
|
||||||
|
@ -47,6 +47,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
|
|||||||
CLEAN += *.sensinode
|
CLEAN += *.sensinode
|
||||||
|
|
||||||
ifeq ($(UIP_CONF_IPV6),1)
|
ifeq ($(UIP_CONF_IPV6),1)
|
||||||
|
CFLAGS += -DUIP_CONF_IPV6=1
|
||||||
ifeq ($(OFFSET_FIRMWARE),1)
|
ifeq ($(OFFSET_FIRMWARE),1)
|
||||||
CFLAGS += -DDISCO_ENABLED=1
|
CFLAGS += -DDISCO_ENABLED=1
|
||||||
CONTIKI_TARGET_SOURCEFILES += disco.c
|
CONTIKI_TARGET_SOURCEFILES += disco.c
|
||||||
|
@ -209,11 +209,6 @@
|
|||||||
#define UIP_CONF_ROUTER 1
|
#define UIP_CONF_ROUTER 1
|
||||||
#endif
|
#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_ND6_SEND_RA 0
|
||||||
#define UIP_CONF_IP_FORWARD 0
|
#define UIP_CONF_IP_FORWARD 0
|
||||||
#define RPL_CONF_STATS 0
|
#define RPL_CONF_STATS 0
|
||||||
@ -281,4 +276,9 @@
|
|||||||
#define QUEUEBUF_CONF_NUM 8
|
#define QUEUEBUF_CONF_NUM 8
|
||||||
#endif /* UIP_CONF_IPV6 */
|
#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__ */
|
#endif /* __CONTIKI_CONF_H__ */
|
||||||
|
Loading…
Reference in New Issue
Block a user