Multi-platform support, osd-merkur-{128,256}

Rename guhRF platform to osd-merkur-256, previous osd-merkur platform is
now osd-merkur-128. Also check that everything is consistent.
Add both platforms to the regression tests.
Move redundant files in platform dev directory of both platforms to
cpu/avr/dev. Note that this probably needs some rework. Already
discovered some inconsistency in io definitions of both devices in the
avr/io.h includes. Added a workaround in the obvious cases.
The platform makefiles now set correct parameters for bootloader and for
reading mac-address from flash memory.
Factor the flash programming into cpu/avr and platform/osd-merkur* and
rework *all* osd example makefiles to use the new settings. Also update
all the flash.sh and run.sh to use the new settings.
The suli ledstrip modules (and osd example) have also been removed.

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "tools/cc2538-bsl"]
 	path = tools/cc2538-bsl
 	url = https://github.com/JelmerT/cc2538-bsl.git
-[submodule "platform/osd-merkur/dev/LED_Strip_Suli"]
-	path = platform/osd-merkur/dev/LED_Strip_Suli
-	url = https://github.com/osdomotics/LED_Strip_Suli.git
 [submodule "cpu/cc26xx-cc13xx/lib/cc26xxware"]
 	path = cpu/cc26xx-cc13xx/lib/cc26xxware
 	url = https://github.com/g-oikonomou/cc26xxware.git

cpu/avr/Makefile.avr

@@ -12,7 +12,7 @@ CONTIKI_CPU=$(CONTIKI)/cpu/avr
 
 ### These directories will be searched for the specified source files
 ### TARGETLIBS are platform-specific routines in the contiki library path
-CONTIKI_CPU_DIRS            = . dev
+CONTIKI_CPU_DIRS            = . dev dev/arduino
 AVR        = clock.c mtarch.c eeprom.c flash.c rs232.c leds-arch.c \
              watchdog.c rtimer-arch.c bootloader.c
 ELFLOADER  = elfloader.c elfloader-avr.c symtab-avr.c
@@ -202,23 +202,30 @@ endif
 ### Upload image
 #Let avrdude use defaults if port or programmer not defined
 AVRDUDE ?= avrdude
-ifdef AVRDUDE_PORT
- AVRDUDE_PORT:=-P $(AVRDUDE_PORT)
-endif
-ifdef AVRDUDE_PROGRAMMER
- AVRDUDE_PROGRAMMER:=-c $(AVRDUDE_PROGRAMMER)
-endif
 ifdef AVRDUDE_MCU
- AVRDUDE_MCU:=-p $(AVRDUDE_MCU)
+ DUDE_MCU:=-p $(AVRDUDE_MCU)
 else
- AVRDUDE_MCU:=-p $(MCU)
+ DUDE_MCU:=-p $(MCU)
 endif
 %.u: %.hex
-	$(AVRDUDE) $(AVRDUDE_MCU) $(AVRDUDE_OPTIONS) $(AVRDUDE_PORT) $(AVRDUDE_PROGRAMMER) -U flash:w:$<
+	$(AVRDUDE) $(DUDE_MCU) $(AVRDUDE_OPTIONS) -P $(AVRDUDE_PORT) \
+        -c $(AVRDUDE_PROGRAMMER) -U flash:w:$<:i
 
 %.eu: %.eep
-	$(AVRDUDE) $(AVRDUDE_MCU) ${AVRDUDE_OPTIONS} ${AVRDUDE_PORT} ${AVRDUDE_PROGRAMMER} -U eeprom:w:$<
+	$(AVRDUDE) $(DUDE_MCU) ${AVRDUDE_OPTIONS} -P ${AVRDUDE_PORT} \
+        -c ${AVRDUDE_PROGRAMMER} -U eeprom:w:$<:i
 
 symbols.c:
 	cp ${CONTIKI}/tools/empty-symbols.c symbols.c
 	cp ${CONTIKI}/tools/empty-symbols.h symbols.h
+
+# Generic rules for .hex, .eep and .sz (size) file:
+%.$(TARGET).hex: %.$(TARGET)
+	$(OBJCOPY) -j .text -j .data -O ihex $< $@
+
+%.$(TARGET).eep: %.$(TARGET)
+	$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
+	--change-section-lma .eeprom=0 -O ihex $< $@
+
+%.$(TARGET).sz: %.$(TARGET)
+	$(ELF_SIZE) $<

cpu/avr/dev/led.h

@@ -43,6 +43,19 @@
 
 #include <avr/io.h>
 
+/* Some io.h definitions of shift vary among processors */
+#ifndef DDE0
+#define DDE0 DDRE0
+#define DDE1 DDRE1
+#define DDE2 DDRE2
+#define DDE3 DDRE3
+#define DDE4 DDRE4
+#define DDE5 DDRE5
+#define DDE6 DDRE6
+#define DDE7 DDRE7
+#endif
+
+
 /** @name LED Functions */
 /** @{ */
 void led1_on(void);

cpu/avr/dev/sg-ready.c

@@ -98,8 +98,8 @@ sg_set_state(uint8_t state)
       State 2 - Relays 0:0  
       State 3 - Relays 0:1
       State 4 - Relays 1:1
-   */
    uint8_t i = 0;
+   */
    uint8_t current_state;
 
    PRINTF("GET STATE\n");

cpu/avr/dev/sg-ready.h

@@ -43,6 +43,29 @@
 
 #include <avr/io.h>
 
+/* Some other io settings of io include define DDRxx as DDxx */
+#ifndef DDRB0
+#define DDRB0 DDB0
+#define DDRB1 DDB1
+#define DDRB2 DDB2
+#define DDRB3 DDB3
+#define DDRB4 DDB4
+#define DDRB5 DDB5
+#define DDRB6 DDB6
+#define DDRB7 DDB7
+#endif
+
+#ifndef DDRD0
+#define DDRD0 DDD0
+#define DDRD1 DDD1
+#define DDRD2 DDD2
+#define DDRD3 DDD3
+#define DDRD4 DDD4
+#define DDRD5 DDD5
+#define DDRD6 DDD6
+#define DDRD7 DDD7
+#endif
+
 #define LATCH_TIME 3000 // time in micro seconds
 
 #define RELAY1_ON     (1<<DDRB4)

examples/osd/.gitignore

@@ -1,2 +1,4 @@
 *.osd-merkur
 *.eep
+*.osd-merkur-128
+*.osd-merkur-256

examples/osd/arduino-climate3/Makefile

@@ -1,18 +1,11 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES) 
+all: $(EXE)
 
 CONTIKI=../../..
 
-# Contiki IPv6 configuration
-CONTIKI_WITH_IPV6 = 1
-
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 LFLAGS += -lm
 
@@ -29,59 +22,33 @@ REST_RESOURCES_FILES= $(notdir \
 PROJECTDIRS += $(REST_RESOURCES_DIR) $(REST_RESOURCES_DIR_COMMON)
 PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES)
 
-# variable for Makefile.include
-ifneq ($(TARGET), minimal-net)
-CFLAGS += -DUIP_CONF_IPV6_RPL=1
-else
-# minimal-net does not support RPL under Linux and is mostly used to test CoAP only
-${info INFO: compiling without RPL}
-CFLAGS += -DUIP_CONF_IPV6_RPL=0
-CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-${info INFO: compiling with large buffers}
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048
-CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
-CFLAGS += -DCOAP_MAX_HEADER_SIZE=640
-endif
-
 # linker optimizations
 SMALL=1
 
-
 # REST Engine shall use Erbium CoAP implementation
 APPS += er-coap
 APPS += rest-engine
 APPS += arduino
 
+CONTIKI_WITH_IPV6 = 1
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
-$(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
+$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
 connect-router: $(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
 
-connect-router-cooja:   $(CONTIKI)/tools/tunslip6
+connect-router-cooja: $(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-climate3/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-climate3/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-dallastemp/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES) 
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -55,25 +51,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -85,3 +62,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-dallastemp/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-dallastemp/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-distance/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/tty.usbserial-AE01CZ7S -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-distance/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-distance/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-dooralert/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-dooralert/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-dooralert/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-htu21/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES) 
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -55,25 +51,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -85,3 +62,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-htu21/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-htu21/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-ledstrip/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -55,25 +51,6 @@ APPS += json json-resource
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -86,3 +63,9 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
 	
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-ledstrip/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-ledstrip/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-merkurboard/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-merkurboard/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-merkurboard/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-plantobserving/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-plantobserving/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-plantobserving/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-roller/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-roller/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-roller/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-roomalert/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -55,25 +51,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -85,3 +62,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-roomalert/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-roomalert/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-sketch/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -42,25 +38,6 @@ APPS += time json arduino json-resource
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -72,3 +49,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-sketch/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-sketch/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-wateralert/Makefile

@@ -1,12 +1,8 @@
 # Set this to the name of your sketch (without extension .pde)
 SKETCH=sketch
+EXE=arduino-example
 
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size arduino-example.osd-merkur.hex \
-    arduino-example.osd-merkur.eep
-endif
-
-all: arduino-example $(PLATFORM_FILES)
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -54,25 +50,6 @@ APPS += arduino
 include $(CONTIKI)/Makefile.include
 include $(CONTIKI)/apps/arduino/Makefile.include
 
-avr-size: arduino-example.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 arduino-example.osd-merkur
-
-arduino-example.osd-merkur.hex: arduino-example.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex arduino-example.osd-merkur \
-	    arduino-example.osd-merkur.hex
-
-arduino-example.osd-merkur.eep: arduino-example.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    arduino-example.osd-merkur arduino-example.osd-merkur.eep
-
-flash: arduino-example.osd-merkur.hex arduino-example.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:arduino-example.osd-merkur.hex:a -U \
-	    eeprom:w:arduino-example.osd-merkur.eep:a
-
-.PHONY: flash avr-size
-
 $(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
 	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
 
@@ -84,3 +61,10 @@ connect-router-cooja:   $(CONTIKI)/tools/tunslip6
 
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-wateralert/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-make TARGET=osd-merkur flash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-wateralert/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/climate/Makefile

@@ -1,10 +1,5 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep
-endif
-
-all: er-example-server $(PLATFORM_FILES)
-# use target "er-plugtest-server" explicitly when requried 
+EXE=er-example-server
+all: $(EXE)
 
 CONTIKI=../../..
 
@@ -74,21 +69,9 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
 
-avr-size: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
+avr-size: $(EXE).$(TARGET).sz
 
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
-
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
-
-flash: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
 
 .PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/climate/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash

examples/osd/climate/run.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # For the ages-old bootloader (before 2014) you want to use
 # BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
-make clean TARGET=osd-merkur
-make TARGET=osd-merkur
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/climate2/Makefile

@@ -1,9 +1,6 @@
-ifeq ($(TARGET), osd-merkur)
-PLATFORM_FILES= avr-size er-example-server.osd-merkur.hex \
-    er-example-server.osd-merkur.eep
-endif
+EXE=er-example-server
 
-all: er-example-server $(PLATFORM_FILES)
+all: $(EXE)
 # use target "er-plugtest-server" explicitly when requried 
 
 CONTIKI=../../..
@@ -74,21 +71,9 @@ connect-router-native:	$(CONTIKI)/examples/ipv6/native-border-router/border-rout
 connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0 
 
-avr-size: er-example-server.osd-merkur
-	avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
+avr-size: $(EXE).$(TARGET).sz
 
-er-example-server.osd-merkur.hex: er-example-server.osd-merkur
-	avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur \
-	    er-example-server.osd-merkur.hex
-
-er-example-server.osd-merkur.eep: er-example-server.osd-merkur
-	avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	    --change-section-lma .eeprom=0 -O ihex                      \
-	    er-example-server.osd-merkur er-example-server.osd-merkur.eep
-
-flash: er-example-server.osd-merkur.hex er-example-server.osd-merkur.eep
-	avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U \
-	    flash:w:er-example-server.osd-merkur.hex:a -U \
-	    eeprom:w:er-example-server.osd-merkur.eep:a
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
 
 .PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/climate2/flash.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a
+make TARGET=osd-merkur-128 flash