From ffa0147920b351b73d4e03bc2b125c0b07571efb Mon Sep 17 00:00:00 2001 From: Ian Martin Date: Fri, 24 Jan 2014 11:49:47 -0500 Subject: [PATCH 1/4] rl78: Rename CORE to RL78_CORE to avoid a conflict with Contiki's CORE variable. --- cpu/rl78/Makefile.rl78 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpu/rl78/Makefile.rl78 b/cpu/rl78/Makefile.rl78 index 62853e42d..562453720 100755 --- a/cpu/rl78/Makefile.rl78 +++ b/cpu/rl78/Makefile.rl78 @@ -42,7 +42,7 @@ ifdef IAR DEVICE ?= r5f100ll # According to "rl78/config/devices/RL78 - G13/r5f100ll.menu", the R5F100LLA has core 1. - CORE ?= 1 + RL78_CORE ?= 1 # Default library configuration (n = normal, f = full): LIB_CONFIG ?= n @@ -55,7 +55,7 @@ ifdef IAR CFLAGS += --silent CFLAGS += --debug - CFLAGS += --core rl78_$(CORE) + CFLAGS += --core rl78_$(RL78_CORE) CFLAGS += --code_model $(CODE_MODEL) CFLAGS += --data_model $(DATA_MODEL) CFLAGS += -I$(IAR_PATH)\\lib @@ -73,7 +73,7 @@ ifdef IAR AROPTS ?= -S - TARGET_LIBFILES += $(IAR_PATH)\\lib\\dlrl78$(CODE_MODEL)$(DATA_MODEL)$(CORE)$(LIB_CONFIG).r87 + TARGET_LIBFILES += $(IAR_PATH)\\lib\\dlrl78$(CODE_MODEL)$(DATA_MODEL)$(RL78_CORE)$(LIB_CONFIG).r87 CUSTOM_RULE_C_TO_O = 1 %.o: %.c From ed4edab46191d676ea3307f7799bbfa57328f6b0 Mon Sep 17 00:00:00 2001 From: Ian Martin Date: Fri, 24 Jan 2014 12:49:16 -0500 Subject: [PATCH 2/4] eval-adf7xxxmb4z: Corrections to the platform README, update URLs to point to the mainline Contiki. --- platform/eval-adf7xxxmb4z/README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/eval-adf7xxxmb4z/README.md b/platform/eval-adf7xxxmb4z/README.md index bcee2a5b8..1faa1a625 100644 --- a/platform/eval-adf7xxxmb4z/README.md +++ b/platform/eval-adf7xxxmb4z/README.md @@ -19,11 +19,10 @@ Convert the RPM package to a Debian package and install it: Obtain the Contiki source code: - git clone -b rl78-dev https://github.com/hexluthor/contiki.git + git clone https://github.com/contiki-os/contiki.git Build Contiki's example-abc: - cd contiki/examples/rime make -C contiki/examples/rime TARGET=eval-adf7xxxmb4z example-abc.eval-adf7xxxmb4z.srec The code can be flashed to the eval board using @@ -80,10 +79,10 @@ Download and install Obtain the Contiki source code using [git](http://git-scm.com/download/win): - git clone -b rl78-dev https://github.com/hexluthor/contiki.git + git clone https://github.com/contiki-os/contiki.git Alternatively, download a -[zip file](https://github.com/hexluthor/contiki/archive/rl78-dev.zip) +[zip file](https://github.com/contiki-os/contiki/archive/master.zip) of the latest source. Build Contiki's example-abc using the RL78 Toolchain shell. @@ -109,10 +108,10 @@ and [make](http://gnuwin32.sourceforge.net/downlinks/make.php). Obtain the Contiki source code using [git](http://git-scm.com/download/win): - git clone -b rl78-dev https://github.com/hexluthor/contiki.git + git clone https://github.com/contiki-os/contiki.git Alternatively, download a -[zip file](https://github.com/hexluthor/contiki/archive/rl78-dev.zip) +[zip file](https://github.com/contiki-os/contiki/archive/master.zip) of the latest source. Build Contiki's example-abc. From 935322665e4cba4eb2c299f67e24b458b63cb880 Mon Sep 17 00:00:00 2001 From: Ian Martin Date: Fri, 24 Jan 2014 12:50:43 -0500 Subject: [PATCH 3/4] rl78: Attempt to locate the IAR installation automatically and instruct the user how to specify IAR_PATH if it cannot be found. --- cpu/rl78/Makefile.rl78 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cpu/rl78/Makefile.rl78 b/cpu/rl78/Makefile.rl78 index 562453720..a20382b7f 100755 --- a/cpu/rl78/Makefile.rl78 +++ b/cpu/rl78/Makefile.rl78 @@ -47,7 +47,15 @@ ifdef IAR # Default library configuration (n = normal, f = full): LIB_CONFIG ?= n - IAR_PATH ?= C:\\Program\ Files\\IAR\ Systems\\Embedded\ Workbench\ 6.5\\rl78 + ifeq ($(IAR_PATH),) + IAR_SUBPATH := $(shell ls "C:\Program Files\IAR Systems" | tail -1 ) + + ifeq ($(IAR_SUBPATH),) + $(error Unable to find the IAR installation path. Please specify IAR_PATH. For example: make IAR_PATH="C:\\Program\ Files\\IAR\ Systems\\Embedded\ Workbench\ 6.5\\rl78" ) + endif + + IAR_PATH := "C:\Program Files\IAR Systems\$(IAR_SUBPATH)\rl78" + endif CC = $(IAR_PATH)\\bin\\iccrl78 LD = $(IAR_PATH)\\bin\\xlink From f3cc60710134f3576cffbb9c06bb72280275f78d Mon Sep 17 00:00:00 2001 From: Ian Martin Date: Sun, 26 Jan 2014 17:40:31 -0500 Subject: [PATCH 4/4] eval-adf7xxxmb4z: Use the nullrdc driver instead of sicslowmac. --- platform/eval-adf7xxxmb4z/contiki-conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/eval-adf7xxxmb4z/contiki-conf.h b/platform/eval-adf7xxxmb4z/contiki-conf.h index cc033bd2b..407251e6e 100644 --- a/platform/eval-adf7xxxmb4z/contiki-conf.h +++ b/platform/eval-adf7xxxmb4z/contiki-conf.h @@ -76,7 +76,7 @@ #define NETSTACK_CONF_NETWORK rime_driver #define NETSTACK_CONF_MAC csma_driver -#define NETSTACK_CONF_RDC sicslowmac_driver +#define NETSTACK_CONF_RDC nullrdc_driver #define NETSTACK_CONF_RADIO adf7023_driver #define NETSTACK_CONF_FRAMER framer_802154