deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow changing bootloader_get_mac address

Browse source 
Current default in the Makefile is the *new* bootloader address.
But for backward compatibility we've modified the run*.sh files
to use the old address. The run*.sh also now explain how to change
the default.
This commit is contained in:
Ralf Schlatterbeck 2014-05-13 16:56:59 +02:00
parent 0a5872e261
commit be01bf77a9
19 changed files with 61 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/osd/.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
*.osd-merkur
*.eep

4
examples/osd/6lowpan-tk/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/climate/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/dual-rgbw-actor/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
#make clean TARGET=osd-merkur #make clean TARGET=osd-merkur
make -j TARGET=osd-merkur make -j TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
#avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur #avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/embedd-vm-merkurboard/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 embedd-vm-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 embedd-vm-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.hex
avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.eep avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex embedd-vm-server.osd-merkur embedd-vm-server.osd-merkur.eep

4
examples/osd/er-rest-example-merkurboard/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/er-rest-example-merkurboard/runclient.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-client.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-client.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.hex
avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.eep avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.eep

4
examples/osd/light-actor/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/light-shutter-control/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/merkurboard/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/merkurboard/runclient.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-client.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-client.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.hex
avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.eep avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-client.osd-merkur er-example-client.osd-merkur.eep

4
examples/osd/pingtheplug/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/pir-sensor/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/powerbox/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/rpl-border-router/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 border-router.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 border-router.osd-merkur
avr-objcopy -j .text -j .data -O ihex border-router.osd-merkur border-router.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex border-router.osd-merkur border-router.osd-merkur.hex
avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-merkur border-router.osd-merkur.eep avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-merkur border-router.osd-merkur.eep

4
examples/osd/servo-sensor/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

4
examples/osd/slip-radio/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size slip-radio.osd-merkur avr-size slip-radio.osd-merkur
avr-objcopy -j .text -j .data -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.hex
avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.eep avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex slip-radio.osd-merkur slip-radio.osd-merkur.eep

4
examples/osd/wirelessplug/run.sh
View file

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
# For the new bootloader (using a jump-table) you want to use
# BOOTLOADER_GET_MAC=0x0001ff80 (which is the current default)
make clean TARGET=osd-merkur make clean TARGET=osd-merkur
make TARGET=osd-merkur make TARGET=osd-merkur BOOTLOADER_GET_MAC=0x0001f3a0
avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur
avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex
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 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

9
platform/osd-merkur/Makefile.osd-merkur
View file

@ -50,7 +50,14 @@ AVRDUDE_MCU=m128rfa1
# CFLAGS += -save-temps # CFLAGS += -save-temps
# Bootloader bonsai # Bootloader bonsai
# LDFLAGS += -save-temps # LDFLAGS += -save-temps
LDFLAGS += -Wl,--defsym,bootloader_get_mac=0x0001f3a0 # For the old bonsai bootloader compiled with squeeze gcc-avr we
# directly used the address of the bootloader:
#BOOTLOADER_GET_MAC=0x0001f3a0
# For newer bonsai we have a jump table at the end of the bootloader
# section:
BOOTLOADER_GET_MAC=0x0001ff80
LDFLAGS += -Wl,--defsym,bootloader_get_mac=$(BOOTLOADER_GET_MAC)
include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/Makefile.avr