shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

remove hacker/secure builds

Browse Source
This commit is contained in:
Conor Patrick 2019-10-27 12:32:36 -04:00
parent 98803b7dd0
commit 8ecaa9a3de
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
in-docker-build.sh
View File

@ -4,6 +4,7 @@ version=$1
export PREFIX=/opt/gcc-arm-none-eabi-8-2019-q3-update/bin/ export PREFIX=/opt/gcc-arm-none-eabi-8-2019-q3-update/bin/
cd /solo/targets/stm32l432 cd /solo/targets/stm32l432
ls
make cbor make cbor
@ -11,9 +12,8 @@ out_dir="/builds"
function build() { function build() {
part=${1} part=${1}
variant=${2} output=${2}
output=${3:-${part}} what="${part}"
what="${part}-${variant}"
make full-clean make full-clean
@ -27,22 +27,27 @@ function build() {
cp ${out_hex} ${out_sha2} ${out_dir} cp ${out_hex} ${out_sha2} ${out_dir}
} }
build bootloader nonverifying build bootloader-nonverifying bootloader
build bootloader verifying build bootloader-verifying bootloader
build firmware hacker solo build firmware solo
build firmware hacker-debug-1 solo build firmware-debug-1 solo
build firmware hacker-debug-2 solo build firmware-debug-2 solo
build firmware secure solo build firmware solo
build firmware secure-non-solokeys solo
cd ${out_dir} cd ${out_dir}
bundle="bundle-hacker-${version}" bundle="bundle-hacker-${version}"
/opt/conda/bin/solo mergehex bootloader-nonverifying-${version}.hex firmware-hacker-${version}.hex ${bundle}.hex /opt/conda/bin/solo mergehex bootloader-nonverifying-${version}.hex firmware-${version}.hex ${bundle}.hex
sha256sum ${bundle}.hex > ${bundle}.sha2 sha256sum ${bundle}.hex > ${bundle}.sha2
bundle="bundle-hacker-debug-1-${version}" bundle="bundle-hacker-debug-1-${version}"
/opt/conda/bin/solo mergehex bootloader-nonverifying-${version}.hex firmware-hacker-debug-1-${version}.hex ${bundle}.hex /opt/conda/bin/solo mergehex bootloader-nonverifying-${version}.hex firmware-debug-1-${version}.hex ${bundle}.hex
bundle="bundle-hacker-debug-2-${version}" sha256sum ${bundle}.hex > ${bundle}.sha2
/opt/conda/bin/solo mergehex bootloader-nonverifying-${version}.hex firmware-hacker-debug-2-${version}.hex ${bundle}.hex
bundle="bundle-secure-non-solokeys-${version}" bundle="bundle-hacker-debug-2-${version}"
/opt/conda/bin/solo mergehex bootloader-verifying-${version}.hex firmware-secure-non-solokeys-${version}.hex ${bundle}.hex /opt/conda/bin/solo mergehex bootloader-nonverifying-${version}.hex firmware-debug-2-${version}.hex ${bundle}.hex
sha256sum ${bundle}.hex > ${bundle}.sha2
bundle="bundle-secure-non-solokeys-${version}"
/opt/conda/bin/solo mergehex --lock bootloader-verifying-${version}.hex firmware-${version}.hex ${bundle}.hex
sha256sum ${bundle}.hex > ${bundle}.sha2 sha256sum ${bundle}.hex > ${bundle}.sha2

18
targets/stm32l432/Makefile
View File

@ -13,20 +13,14 @@ merge_hex=solo mergehex
# The following are the main targets for reproducible builds. # The following are the main targets for reproducible builds.
# TODO: better explanation # TODO: better explanation
firmware-hacker: firmware:
$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=0 EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0' $(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=0
firmware-hacker-debug-1: firmware-debug-1:
$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=1 EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0' $(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=1
firmware-hacker-debug-2: firmware-debug-2:
$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=2 EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0' $(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=2
firmware-secure-non-solokeys:
$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=0 EXTRA_DEFINES='-DFLASH_ROP=2'
firmware-secure:
$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=0 EXTRA_DEFINES='-DUSE_SOLOKEYS_CERT -DFLASH_ROP=2'
bootloader-nonverifying: bootloader-nonverifying:
$(MAKE) -f $(BOOTMAKE) -j8 bootloader.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DSOLO_HACKER' DEBUG=0 $(MAKE) -f $(BOOTMAKE) -j8 bootloader.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DSOLO_HACKER' DEBUG=0