upd: merge bootloader (#48)

Author: sergiotomasello

boards.txt

@@ -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
 
 
@@ -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

platform.txt

@@ -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