only: merging BLT branches

This commit is contained in:
rusefillc 2024-01-30 14:37:47 -05:00
parent fee9475f7a
commit 6582a33d59
1 changed files with 13 additions and 14 deletions

View File

@ -63,6 +63,19 @@ if [ "$USE_OPENBLT" = "yes" ]; then
#cp build/rusefi.hex deliver/rusefi_update.hex
# srec is the only format used by OpenBLT host tools
cp build/rusefi.srec deliver/rusefi_update.srec
# bootloader and composite image
echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT"
$HEX2DFU -i bootloader/blbuild/openblt_$PROJECT_BOARD.hex -o bootloader/blbuild/openblt_$PROJECT_BOARD.dfu
# do we need all these formats?
cp bootloader/blbuild/openblt_$PROJECT_BOARD.bin deliver/openblt.bin
cp bootloader/blbuild/openblt_$PROJECT_BOARD.dfu deliver/openblt.dfu
#cp bootloader/blbuild/openblt_$PROJECT_BOARD.hex deliver/openblt.hex
echo "$SCRIPT_NAME: invoking hex2dfu for composite rusEFI+OpenBLT image"
$HEX2DFU -i bootloader/blbuild/openblt_$PROJECT_BOARD.hex -i build/rusefi.hex $CONTROL_SUM_OPTION -o deliver/rusefi.dfu -b deliver/rusefi.bin
else
# standalone images (for use with no bootloader)
cp build/rusefi.bin deliver/
@ -74,20 +87,6 @@ else
fi
fi
# bootloader and composite image
if [ "$USE_OPENBLT" = "yes" ]; then
echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT"
$HEX2DFU -i bootloader/blbuild/openblt_$PROJECT_BOARD.hex -o bootloader/blbuild/openblt_$PROJECT_BOARD.dfu
# do we need all these formats?
cp bootloader/blbuild/openblt_$PROJECT_BOARD.bin deliver/openblt.bin
cp bootloader/blbuild/openblt_$PROJECT_BOARD.dfu deliver/openblt.dfu
#cp bootloader/blbuild/openblt_$PROJECT_BOARD.hex deliver/openblt.hex
echo "$SCRIPT_NAME: invoking hex2dfu for composite rusEFI+OpenBLT image"
$HEX2DFU -i bootloader/blbuild/openblt_$PROJECT_BOARD.hex -i build/rusefi.hex $CONTROL_SUM_OPTION -o deliver/rusefi.dfu -b deliver/rusefi.bin
fi
echo "$SCRIPT_NAME: build folder content:"
ls -l build