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

@@ -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
 

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
 

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
 

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

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
 

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

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