simplify

Author: webjay

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
         run: docker run --platform linux/amd64 --env "PUBLIC_KEY_HEX=${{ secrets.PUBLIC_KEY_HEX }}" --name firmware-container si-moko
 
       - name: Copy firmware from container
-        run: docker cp firmware-container:/spaceinvader/firmware.bin $GITHUB_WORKSPACE/firmware.bin
+        run: docker cp firmware-container:/spaceinvader/dist/firmware.bin $GITHUB_WORKSPACE/firmware.bin
 
       - name: Create Release
         id: create_release

build.sh

@@ -7,29 +7,27 @@ set -e
 WORKSPACE=/spaceinvader
 cd $WORKSPACE
 
-# make a directory for hexadecimal files
+# Make directories for hexadecimal files and the final binary
 mkdir $WORKSPACE/hex
+mkdir $WORKSPACE/dist
 
 # Initialize and update git submodules
 git submodule init
 git submodule update
 
 # Compile micro-ecc library
-cd $WORKSPACE/apps/secure_bootloader/micro-ecc-build
-make
+make --directory=$WORKSPACE/apps/secure_bootloader/micro-ecc-build
 
 # Set the public key for the secure bootloader
 sed -i "s/\/\* PUBLIC_KEY_PLACEHOLDER \*\//$PUBLIC_KEY_HEX/" $WORKSPACE/apps/firmware/dfu_images/public_key.c
 
 # Compile secure bootloader
-cd $WORKSPACE/apps/secure_bootloader/build
-make
-cp $WORKSPACE/apps/secure_bootloader/build/_build/secure_bootloader_moko.hex $WORKSPACE/hex
+make --directory=$WORKSPACE/apps/secure_bootloader/build
+mv $WORKSPACE/apps/secure_bootloader/build/_build/secure_bootloader_moko.hex $WORKSPACE/hex
 
 # Compile firmware
-cd $WORKSPACE/apps/firmware/build
-make
-cp $WORKSPACE/apps/firmware/build/_build/nrf52810_xxaa.hex $WORKSPACE/hex
+make --directory=$WORKSPACE/apps/firmware/build
+mv $WORKSPACE/apps/firmware/build/_build/nrf52810_xxaa.hex $WORKSPACE/hex
 
 # Make hexadecimal files
 cd $WORKSPACE/hex
@@ -39,7 +37,7 @@ nrfutil settings generate --family NRF52810 --application nrf52810_xxaa.hex --ap
 
 # Merge hex files
 cp $WORKSPACE/nRF5_SDK_17.0.2_d674dde/components/softdevice/s112/hex/s112_nrf52_7.2.0_softdevice.hex $WORKSPACE/hex
-mergehex -m bl_settings.hex secure_bootloader_moko.hex nrf52810_xxaa.hex s112_nrf52_7.2.0_softdevice.hex --output full_dfu.hex
+mergehex --merge bl_settings.hex secure_bootloader_moko.hex nrf52810_xxaa.hex s112_nrf52_7.2.0_softdevice.hex --output firmware.hex
 
 # Convert the HEX file to a BIN file
-arm-none-eabi-objcopy -I ihex -O binary full_dfu.hex $WORKSPACE/firmware.bin
+arm-none-eabi-objcopy --input-target=ihex --output-target=binary firmware.hex $WORKSPACE/dist/firmware.bin