Skip to content

Commit

Permalink
Build: correct firmware file naming
Browse files Browse the repository at this point in the history
  • Loading branch information
szszszsz committed Jun 19, 2021
1 parent 290aadb commit 71f7455
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ release: | clean
cp `readlink -f $(BUILD_DIR)/last.hex` `readlink -f $(BUILD_DIR)/last_update.hex` `readlink -f $(BUILD_DIR)/last.buildinfo` release/
cd release && find . -name "*.hex" -type f -printf "%f\0" | xargs -0 -n1 -I{} sh -c 'sha512sum -b {} > {}.sha512'
ls -lh release
tar -czvf nitrokey-pro-firmware-hw$(HW_REV).tar.gz -C release .
tar -czvf nitrokey-hsm-firmware-hw$(HW_REV).tar.gz -C release .

release-all:
mkdir -p release-all
Expand Down
4 changes: 2 additions & 2 deletions build/gcc/dfu.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ bootloader.hex: $(BOOTLOADER)
ls -lh $@
srec_info $@ -i

FIRMWARE_FILE_NAME_UPDATE=nitrokey-pro-firmware-$(shell git describe --long)-to_update.hex
FIRMWARE_FILE_NAME_UPDATE=nitrokey-hsm-firmware-$(shell git describe --long)-to_update.hex
firmware.hex: $(FIRMWAREBIN)
srec_cat $< -Binary -offset 0x8002000 -Output $@ -Intel
cp $@ $(FIRMWARE_FILE_NAME_UPDATE)
ln -sf $(FIRMWARE_FILE_NAME_UPDATE) last_update.hex
ls -lh $@
srec_info $@ -i

FIRMWARE_FILE_NAME=nitrokey-pro-firmware-$(shell git describe --long)-to_flash.hex
FIRMWARE_FILE_NAME=nitrokey-hsm-firmware-$(shell git describe --long)-to_flash.hex
all.hex: bootloader.hex firmware.hex
srec_cat bootloader.hex -Intel firmware.hex -Intel -Output $@ -Intel
cp $@ $(FIRMWARE_FILE_NAME)
Expand Down

0 comments on commit 71f7455

Please sign in to comment.