Skip to content

Commit

Permalink
Implement WITH_RPL option in makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
dak664 committed Aug 28, 2011
1 parent bdec65b commit 5f2b207
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cpu/avr/Makefile.avr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions examples/webserver-ipv6-raven/Makefile.webserver
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions examples/webserver-ipv6-raven/README
Original file line number Diff line number Diff line change
Expand Up @@ -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.

0 comments on commit 5f2b207

Please sign in to comment.