Skip to content
This repository was archived by the owner on Feb 21, 2020. It is now read-only.

upd: merge bootloader #48

Merged
merged 1 commit into from
Jun 16, 2017
Merged

upd: merge bootloader #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ primo.build.components=components
primo.build.vid=0x2a03
primo.build.pid=0x805a

#new defined attributes
#primo.bootloader.file=
primo.bootloader.file=primo/bootloader_primo_v1.0.0.hex
primo.firmware.softdevice.file=primo/softdevice/s132_nrf52_2.0.0_softdevice.hex


Expand Down Expand Up @@ -66,6 +65,5 @@ primo_core.build.openocdscript=openocd_scripts/arduino_primo.cfg
primo_core.build.variant=arduino_primo_core
primo_core.build.components=components

#new defined attributes
#primo_core.bootloader.file=
primo_core.bootloader.file=primo_core/bootloader_primo_core_v1.0.0.hex
primo_core.firmware.softdevice.file=primo/softdevice/s132_nrf52_2.0.0_softdevice.hex
2 changes: 1 addition & 1 deletion platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ recipe.objcopy.eep.pattern="{compiler.path}{compiler.elf2bin.cmd}" {compiler.elf
recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"

## Create merged hex file with softdevice and bootloader
recipe.objcopy.mergehex.pattern="{tools.mergehex.path}/{tools.mergehex.cmd}" --merge "{runtime.platform.path}/firmwares/{firmware.softdevice.file}" "{build.path}/{build.project_name}.hex" --output "{build.path}/{build.project_name}-merged.hex" {tools.mergehex.upload.params.quiet}
recipe.objcopy.mergehex.pattern="{tools.mergehex.path}/{tools.mergehex.cmd}" --merge "{runtime.platform.path}/firmwares/{firmware.softdevice.file}" "{runtime.platform.path}/bootloaders/{bootloader.file}" "{build.path}/{build.project_name}.hex" --output "{build.path}/{build.project_name}-merged.hex" {tools.mergehex.upload.params.quiet}

## Save hex
recipe.output.tmp_file={build.project_name}.hex
Expand Down