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

cc2x3x RPL/non-RPL handling:

Browse source 
- 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
This commit is contained in:
George Oikonomou 2012-04-30 13:49:27 +01:00
parent 259b497122
commit 2f89f41b5a
7 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/cc2530dk/border-router/Makefile
View file

@ -3,6 +3,7 @@ DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
# We need uIPv6, therefore we also need banking # We need uIPv6, therefore we also need banking
HAVE_BANKING=1 HAVE_BANKING=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
UIP_CONF_RPL=1
PROJECT_SOURCEFILES += slip-bridge.c PROJECT_SOURCEFILES += slip-bridge.c

1
examples/cc2530dk/udp-ipv6/Makefile
View file

@ -2,6 +2,7 @@ DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
HAVE_BANKING=1 HAVE_BANKING=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
UIP_CONF_RPL=1
PROJECT_SOURCEFILES += ping6.c PROJECT_SOURCEFILES += ping6.c

1
examples/sensinode/border-router/Makefile
View file

@ -8,6 +8,7 @@ DEFINES+=MODEL_N601,PROJECT_CONF_H
# We need uIPv6, therefore we also need banking # We need uIPv6, therefore we also need banking
HAVE_BANKING=1 HAVE_BANKING=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
UIP_CONF_RPL=1
PROJECT_SOURCEFILES += slip-bridge.c PROJECT_SOURCEFILES += slip-bridge.c

1
examples/sensinode/disco/Makefile
View file

@ -7,6 +7,7 @@ DEFINES+=MODEL_N740
HAVE_BANKING=1 HAVE_BANKING=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
UIP_CONF_RPL=1
OFFSET_FIRMWARE=1 OFFSET_FIRMWARE=1
CONTIKI_PROJECT = disco-example CONTIKI_PROJECT = disco-example

1
examples/sensinode/udp-ipv6/Makefile
View file

@ -8,6 +8,7 @@ DEFINES+=MODEL_N740,PROJECT_CONF_H
# This example won't fit in flash without banking so we turn it on # This example won't fit in flash without banking so we turn it on
HAVE_BANKING=1 HAVE_BANKING=1
UIP_CONF_IPV6=1 UIP_CONF_IPV6=1
UIP_CONF_RPL=1
CONTIKI_SOURCEFILES += ping6.c CONTIKI_SOURCEFILES += ping6.c

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

@ -183,7 +183,6 @@
/* ND and Routing */ /* ND and Routing */
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#define UIP_CONF_IPV6_RPL 1
#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

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

@ -202,7 +202,6 @@
/* ND and Routing */ /* ND and Routing */
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#define UIP_CONF_IPV6_RPL 1
#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