From 2f89f41b5ab573b3e3a603eec7bfb4364c77961f Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Mon, 30 Apr 2012 13:49:27 +0100 Subject: [PATCH] cc2x3x RPL/non-RPL handling: - Relevant examples explicitly request it in their Makefile - Removed the definition of UIP_CONF_IPV6_RPL from contiki-conf.h. If needed, it's defined through a -D --- examples/cc2530dk/border-router/Makefile | 1 + examples/cc2530dk/udp-ipv6/Makefile | 1 + examples/sensinode/border-router/Makefile | 1 + examples/sensinode/disco/Makefile | 1 + examples/sensinode/udp-ipv6/Makefile | 1 + platform/cc2530dk/contiki-conf.h | 1 - platform/sensinode/contiki-conf.h | 1 - 7 files changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/cc2530dk/border-router/Makefile b/examples/cc2530dk/border-router/Makefile index eb8b69c2b..e37325dc6 100644 --- a/examples/cc2530dk/border-router/Makefile +++ b/examples/cc2530dk/border-router/Makefile @@ -3,6 +3,7 @@ DEFINES+=PROJECT_CONF_H=\"project-conf.h\" # We need uIPv6, therefore we also need banking HAVE_BANKING=1 UIP_CONF_IPV6=1 +UIP_CONF_RPL=1 PROJECT_SOURCEFILES += slip-bridge.c diff --git a/examples/cc2530dk/udp-ipv6/Makefile b/examples/cc2530dk/udp-ipv6/Makefile index f21c02ca2..90a2ccba9 100644 --- a/examples/cc2530dk/udp-ipv6/Makefile +++ b/examples/cc2530dk/udp-ipv6/Makefile @@ -2,6 +2,7 @@ DEFINES+=PROJECT_CONF_H=\"project-conf.h\" HAVE_BANKING=1 UIP_CONF_IPV6=1 +UIP_CONF_RPL=1 PROJECT_SOURCEFILES += ping6.c diff --git a/examples/sensinode/border-router/Makefile b/examples/sensinode/border-router/Makefile index b77479824..18ae8b86c 100644 --- a/examples/sensinode/border-router/Makefile +++ b/examples/sensinode/border-router/Makefile @@ -8,6 +8,7 @@ DEFINES+=MODEL_N601,PROJECT_CONF_H # We need uIPv6, therefore we also need banking HAVE_BANKING=1 UIP_CONF_IPV6=1 +UIP_CONF_RPL=1 PROJECT_SOURCEFILES += slip-bridge.c diff --git a/examples/sensinode/disco/Makefile b/examples/sensinode/disco/Makefile index 51b7be77f..f95b14023 100644 --- a/examples/sensinode/disco/Makefile +++ b/examples/sensinode/disco/Makefile @@ -7,6 +7,7 @@ DEFINES+=MODEL_N740 HAVE_BANKING=1 UIP_CONF_IPV6=1 +UIP_CONF_RPL=1 OFFSET_FIRMWARE=1 CONTIKI_PROJECT = disco-example diff --git a/examples/sensinode/udp-ipv6/Makefile b/examples/sensinode/udp-ipv6/Makefile index 00a04ec2d..2f47d11b0 100644 --- a/examples/sensinode/udp-ipv6/Makefile +++ b/examples/sensinode/udp-ipv6/Makefile @@ -8,6 +8,7 @@ DEFINES+=MODEL_N740,PROJECT_CONF_H # This example won't fit in flash without banking so we turn it on HAVE_BANKING=1 UIP_CONF_IPV6=1 +UIP_CONF_RPL=1 CONTIKI_SOURCEFILES += ping6.c diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h index 71a70b70b..c344b943a 100644 --- a/platform/cc2530dk/contiki-conf.h +++ b/platform/cc2530dk/contiki-conf.h @@ -183,7 +183,6 @@ /* ND and Routing */ #define UIP_CONF_ROUTER 1 -#define UIP_CONF_IPV6_RPL 1 #define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_IP_FORWARD 0 #define RPL_CONF_STATS 0 diff --git a/platform/sensinode/contiki-conf.h b/platform/sensinode/contiki-conf.h index 2c812b7cc..b006535d2 100644 --- a/platform/sensinode/contiki-conf.h +++ b/platform/sensinode/contiki-conf.h @@ -202,7 +202,6 @@ /* ND and Routing */ #define UIP_CONF_ROUTER 1 -#define UIP_CONF_IPV6_RPL 1 #define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_IP_FORWARD 0 #define RPL_CONF_STATS 0