diff --git a/cpu/avr/Makefile.avr b/cpu/avr/Makefile.avr index 623879372..a98c8e44d 100644 --- a/cpu/avr/Makefile.avr +++ b/cpu/avr/Makefile.avr @@ -34,6 +34,10 @@ CONTIKI_TARGET_SOURCEFILES += $(USB) //AVR = clock.c mtarch.c eeprom.c flash.c leds-arch.c watchdog.c rtimer-arch.c endif +ifdef WITH_RPL + CFLAGS += -DUIP_CONF_IPV6_RPL=$(WITH_RPL) +endif + #For a coffee file system, the application makefile can define COFFEE_FILES=n #to select the type and COFFEE_ADDRESS=0xaaaaaaaa as the starting byte address. #If only one is define the other will use the (Raven webserver 1284p) defaults diff --git a/examples/webserver-ipv6-raven/Makefile.webserver b/examples/webserver-ipv6-raven/Makefile.webserver index 3faa39b7a..fb7f12964 100644 --- a/examples/webserver-ipv6-raven/Makefile.webserver +++ b/examples/webserver-ipv6-raven/Makefile.webserver @@ -4,6 +4,8 @@ all: webserver6 APPS=raven-webserver raven-lcd-interface TARGET=avr-raven UIP_CONF_IPV6=1 + +#WITH_RPL=1 //RPL is not yet the default. #RF230BB=1 //Use radio driver that communicates with the core MAC layer. Now the default. #COFFEE_FILES=1 //Use coffee file system in EEPROM #COFFEE_FILES=2 //Use coffee file system in program flash diff --git a/examples/webserver-ipv6-raven/README b/examples/webserver-ipv6-raven/README index ad7d725fd..50d5887d6 100644 --- a/examples/webserver-ipv6-raven/README +++ b/examples/webserver-ipv6-raven/README @@ -40,3 +40,15 @@ $make WEBDIR=xxx always forces regeneration of web content into httpd-fsdata.c a so requires PERL. A bare $make after that will not regenerate httpd-fsdata.c. Use $make WEBDIR=default to switch back to the default /http-fs/ content. +See Makefile.webserver for optional switches for RPL or a coffee file system. +$make WITH_RPL=1 for a RPL node, or if rpl has become the contiki default, +$make WITH_RPL=0 to override + +Much headbanging can result if you do not $make clean when changing make options, +as the normal build dependencies are bypassed and the needed object modules +may not be rebuilt. + +$make connect will invoke the /tools/serial-log.pl perl script to connect to +your serial debug port. This will log to the console and optional log file, +adding useful time stamps. Edit the makefile for your serial port configuration. +