Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2025-01-04 04:10:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use tkey-builder:2; add hashes & checks for bitstream & fw bins

Browse Source 
Signed-off-by: Daniel Lublin <daniel@lublin.se>
This commit is contained in:
Daniel Lublin 2023-03-31 10:18:35 +02:00 committed by dehanj
parent aac03357e9
commit 2ddd523c29
No known key found for this signature in database
GPG Key ID: 3707A9DBF4BB8F1A
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yaml vendored
View File

@ -13,7 +13,7 @@ jobs:
ci: ci:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: ghcr.io/tillitis/tkey-builder:1 image: ghcr.io/tillitis/tkey-builder:2
steps: steps:
- name: checkout - name: checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -53,6 +53,10 @@ jobs:
working-directory: hw/application_fpga working-directory: hw/application_fpga
run: make all run: make all
- name: check matching hashes for firmware.bin & application_fpga.bin
working-directory: hw/application_fpga
run: make check-binary-hashes
# TODO? first deal with hw/boards/ and hw/production_test/ # TODO? first deal with hw/boards/ and hw/production_test/
# - name: check for SPDX tags # - name: check for SPDX tags
# run: ./LICENSES/spdx-ensure # run: ./LICENSES/spdx-ensure

3
LICENSES/spdx-ensure
View File

@ -28,6 +28,8 @@ contrib/99-tillitis.rules
contrib/Dockerfile contrib/Dockerfile
contrib/Makefile contrib/Makefile
dco.md dco.md
hw/application_fpga/application_fpga.bin.sha256
hw/application_fpga/config.vlt
hw/application_fpga/core/timer/README.md hw/application_fpga/core/timer/README.md
hw/application_fpga/core/tk1/README.md hw/application_fpga/core/tk1/README.md
hw/application_fpga/core/touch_sense/README.md hw/application_fpga/core/touch_sense/README.md
@ -35,6 +37,7 @@ hw/application_fpga/core/trng/README.md
hw/application_fpga/core/uds/README.txt hw/application_fpga/core/uds/README.txt
hw/application_fpga/data/udi.hex hw/application_fpga/data/udi.hex
hw/application_fpga/data/uds.hex hw/application_fpga/data/uds.hex
hw/application_fpga/firmware.bin.sha512
hw/application_fpga/fw/.clang-format hw/application_fpga/fw/.clang-format
hw/application_fpga/fw/testfw/Makefile hw/application_fpga/fw/testfw/Makefile
hw/application_fpga/fw/tk1/Makefile hw/application_fpga/fw/tk1/Makefile

5
hw/application_fpga/Makefile
View File

@ -157,6 +157,11 @@ firmware.hex: firmware.bin firmware_size_mismatch
testfw.hex: testfw.bin testfw_size_mismatch testfw.hex: testfw.bin testfw_size_mismatch
python3 $(P)/tools/makehex/makehex.py $< $(BRAM_FW_SIZE) > $@ python3 $(P)/tools/makehex/makehex.py $< $(BRAM_FW_SIZE) > $@
.PHONY: check-binary-hashes
check-binary-hashes:
sha512sum -c firmware.bin.sha512
sha256sum -c application_fpga.bin.sha256
%.bin: %.elf %.bin: %.elf
$(SIZE) $< $(SIZE) $<
@test "$$($(SIZE) $< | awk 'NR==2{print $$2, $$3}')" = "0 0" \ @test "$$($(SIZE) $< | awk 'NR==2{print $$2, $$3}')" = "0 0" \

1
hw/application_fpga/application_fpga.bin.sha256 Normal file
View File

@ -0,0 +1 @@
d2970828269b3ba7f09fb73b8592b08814dfe8c8087b00b0659feb516bb00f33 application_fpga.bin

1
hw/application_fpga/firmware.bin.sha512 Normal file
View File

@ -0,0 +1 @@
3769540390ee3d990ea3f9e4cc9a0d1af5bcaebb82218185a78c39c6bf01d9cdc305ba253a1fb9f3f9fcc63d97c8e5f34bbb1f7bec56a8f246f1d2239867b623 firmware.bin