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.
This commit is contained in:
parent
53dd2e5d16
commit
04bbba6c12
237 changed files with 679 additions and 7835 deletions
|
@ -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
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
#!/bin/bash
|
||||
make TARGET=osd-merkur flash
|
||||
make TARGET=osd-merkur-128 flash
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue