rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Openblt deliver (#3486) 

* common_make: rusefi.* should be functional image

OpenBLT used: rusefi.* is bootloader plus RusEFI
OpenBLT not used: rusefi.* is RusEFI only.
In both cases flashing of rusefi.* image to blank device should be
enough.
rusefi_update.srec does not include bootloader and this image should
be used for CAN update.

* Boundle generation: include bootloader and update image

* Update hex2dfu, deliver composite bin file
This commit is contained in:
Andrey G 2021-11-07 21:50:01 +03:00 committed by GitHub
parent fb3da1af14
commit 383d5c97ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
firmware/config/boards/common_make.sh
View File

@ -22,29 +22,42 @@ fi
chmod u+x $HEX2DFU
mkdir -p deliver
rm -f deliver/*
rm -f deliver/rusefi.dfu
echo "$SCRIPT_NAME: invoking hex2dfu for RusEFI"
$HEX2DFU -i build/rusefi.hex -C 0x1C -o deliver/rusefi.dfu
$HEX2DFU -i build/rusefi.hex -C 0x1C -o build/rusefi.dfu
# rusEFI console does not use .hex files but for Cypress that's the primary binary format
cp build/rusefi.hex deliver/
cp build/rusefi.bin deliver/
cp build/rusefi.srec deliver/
# bootloader
if [ $USE_OPENBLT = "yes" ]; then
rm -f deliver/openblt_$PROJECT_BOARD.dfu
echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT"
$HEX2DFU -i build-openblt/openblt_$PROJECT_BOARD.hex -o deliver/openblt_$PROJECT_BOARD.dfu
# this image is suitable for update through bootloader only
# do not deliver update images in any format that can confuse users
#cp build/rusefi.bin deliver/rusefi_update.bin
#cp build/rusefi.dfu deliver/rusefi_update.dfu
#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
else
# standalone images (for use with no bootloader)
cp build/rusefi.bin deliver/
cp build/rusefi.dfu deliver/
# rusEFI console does not use .hex files but for Cypress that's the primary binary format
cp build/rusefi.hex deliver/
fi
cp build-openblt/openblt_$PROJECT_BOARD.hex deliver/
cp build-openblt/openblt_$PROJECT_BOARD.bin deliver/
cp build-openblt/openblt_$PROJECT_BOARD.srec deliver/
# bootloader and composite image
if [ $USE_OPENBLT = "yes" ]; then
rm -f deliver/openblt.dfu
echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT"
$HEX2DFU -i build-openblt/openblt_$PROJECT_BOARD.hex -o build-openblt/openblt_$PROJECT_BOARD.dfu
# do we need all these formats?
cp build-openblt/openblt_$PROJECT_BOARD.bin deliver/openblt.bin
cp build-openblt/openblt_$PROJECT_BOARD.dfu deliver/openblt.dfu
#cp build-openblt/openblt_$PROJECT_BOARD.hex deliver/openblt.hex
rm -f deliver/rusefi_openblt.dfu
echo "$SCRIPT_NAME: invoking hex2dfu for composite RusEFI+OpenBLT image"
$HEX2DFU -i build-openblt/openblt_$PROJECT_BOARD.hex -i build/rusefi.hex -C 0x1C -o deliver/rusefi_openblt.dfu
$HEX2DFU -i build-openblt/openblt_$PROJECT_BOARD.hex -i build/rusefi.hex -C 0x1C -o deliver/rusefi.dfu -b deliver/rusefi.bin
#todo: how to create 'signed' hex and srec? Do we need?
fi
echo "$SCRIPT_NAME: build folder content:"

BIN
misc/encedo_hex2dfu/hex2dfu.bin
View File

Binary file not shown.

6
misc/jenkins/build_working_folder.sh
View File

@ -82,6 +82,12 @@ cp firmware/deliver/rusefi.dfu $FOLDER
# just for now - DFU work in progress
cp firmware/deliver/rusefi.hex $FOLDER
# bootloader
[ -e firmware/deliver/openblt.bin ] && { cp firmware/deliver/openblt.bin $FOLDER ; }
[ -e firmware/deliver/openblt.dfu ] && { cp firmware/deliver/openblt.dfu $FOLDER ; }
# update srec
[ -e firmware/deliver/rusefi_update.srec ] && { cp firmware/deliver/rusefi_update.srec $FOLDER ; }
if [ -n "$BUNDLE_NAME" ]; then
mv $FOLDER/rusefi.dfu $FOLDER/rusefi_$BUNDLE_NAME.dfu
fi