From 13e29c7975d982a1fc716971db49f77891abcee6 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Wed, 20 Mar 2013 18:34:16 +0000 Subject: [PATCH] Fix 8051 port builds to play nicely with #173 --- platform/cc2530dk/Makefile.cc2530dk | 1 + platform/cc2530dk/contiki-conf.h | 10 +++++----- platform/sensinode/Makefile.sensinode | 1 + platform/sensinode/contiki-conf.h | 10 +++++----- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/platform/cc2530dk/Makefile.cc2530dk b/platform/cc2530dk/Makefile.cc2530dk index 655679d66..f8d9c54ab 100644 --- a/platform/cc2530dk/Makefile.cc2530dk +++ b/platform/cc2530dk/Makefile.cc2530dk @@ -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 diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h index 630336380..4b51a0928 100644 --- a/platform/cc2530dk/contiki-conf.h +++ b/platform/cc2530dk/contiki-conf.h @@ -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__ */ diff --git a/platform/sensinode/Makefile.sensinode b/platform/sensinode/Makefile.sensinode index c74a70181..ea70cdfb1 100644 --- a/platform/sensinode/Makefile.sensinode +++ b/platform/sensinode/Makefile.sensinode @@ -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 diff --git a/platform/sensinode/contiki-conf.h b/platform/sensinode/contiki-conf.h index 9662b5ff3..335efb0f4 100644 --- a/platform/sensinode/contiki-conf.h +++ b/platform/sensinode/contiki-conf.h @@ -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__ */