Fix bundle signatures (#1569)

Co-authored-by: Andrei <andreikagit@users.noreply.github.com>
2020-07-04 17:46:27 +03:00 · 2020-07-04 17:46:27 +03:00 · f2e1cabb59
parent f0783bad7b
commit f2e1cabb59
13 changed files with 13 additions and 4 deletions
--- a/firmware/config/boards/frankenso/compile_frankenso_na6.sh
+++ b/firmware/config/boards/frankenso/compile_frankenso_na6.sh
@ -4,6 +4,7 @@ cd ../../..

 export EXTRA_PARAMS="-DDUMMY \
 -DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF \
+ -DSHORT_BOARD_NAME=fra \
 -DFIRMWARE_ID=\\\"frankensoNA6\\\""

 sh config/boards/common_make.sh
--- a/firmware/config/boards/frankenso/compile_frankenso_pal.sh
+++ b/firmware/config/boards/frankenso/compile_frankenso_pal.sh
@ -7,6 +7,7 @@ export EXTRA_PARAMS="-DDUMMY \
 -DEFI_VEHICLE_SPEED=FALSE \
 -DHAL_USE_ICU=FALSE \
 -DEFI_LOGIC_ANALYZER=FALSE \
+ -DSHORT_BOARD_NAME=fra \
 -DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF \
 -DFIRMWARE_ID=\\\"frankensoNA6\\\""

--- a/firmware/config/boards/kinetis/compile_kinetis.sh
+++ b/firmware/config/boards/kinetis/compile_kinetis.sh
@ -3,7 +3,7 @@
 echo "Compiling for Kinetis MKE16F512"
 # TODO: somehow this -DDUMMY is helping us to not mess up the parameters, why?!
 # https://github.com/rusefi/rusefi/issues/684
-export "EXTRA_PARAMS=-DDUMMY -DCPU_MKE16F512VLH16 -DCPU_MKE16F512VLH16_cm4 -D__USE_CMSIS \
+export "EXTRA_PARAMS=-DDUMMY -DSHORT_BOARD_NAME=kin -DCPU_MKE16F512VLH16 -DCPU_MKE16F512VLH16_cm4 -D__USE_CMSIS \
 -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_CHECKS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE \
 -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS"
 # set BUILDDIR=build_kinetis
--- a/firmware/config/boards/microrusefi/compile_mre_f4.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4.sh
@ -4,5 +4,6 @@ cd ../../..

 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F4
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre

 sh config/boards/common_make.sh
--- a/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
@ -5,7 +5,7 @@ cd ../../..
 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F4
 export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST
-export EXTRA_PARAMS=-DHW_CHECK_MODE=TRUE
+export EXTRA_PARAMS=-DHW_CHECK_MODE=TRUE -DSHORT_BOARD_NAME=mre

 sh config/boards/common_make.sh

--- a/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
@ -5,7 +5,7 @@ cd ../../..
 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F4
 export DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE
-export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE
+export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE -DSHORT_BOARD_NAME=mre

 sh config/boards/common_make.sh

--- a/firmware/config/boards/microrusefi/compile_mre_f7.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f7.sh
@ -6,5 +6,6 @@ export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld"

 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F7
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre

 sh config/boards/common_make.sh
--- a/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
+++ b/firmware/config/boards/microrusefi/compile_mre_f7_test.sh
@ -7,5 +7,6 @@ export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld"
 export PROJECT_BOARD=microrusefi
 export PROJECT_CPU=ARCH_STM32F7
 export DEFAULT_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST"
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre

 sh config/boards/common_make.sh
--- a/firmware/config/boards/prometheus/compile_prometheus_405.sh
+++ b/firmware/config/boards/prometheus/compile_prometheus_405.sh
@ -4,6 +4,7 @@

 cd ../../..
 export PROJECT_BOARD=prometheus/f405
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pth

 sh config/boards/common_make.sh

--- a/firmware/config/boards/prometheus/compile_prometheus_469.sh
+++ b/firmware/config/boards/prometheus/compile_prometheus_469.sh
@ -5,6 +5,7 @@
 cd ../../..
 export PROJECT_BOARD=prometheus/f469
 export USE_BOOTLOADER=yes
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pth

 sh config/boards/common_make.sh

--- a/firmware/config/boards/prometheus/prometheus-common.mk
+++ b/firmware/config/boards/prometheus/prometheus-common.mk
@ -15,7 +15,7 @@ BOOTLOADERINC= $(PROJECT_DIR)/bootloader/prometheus/$(PROMETHEUS_BOARD)

 # Default to a release build - clear EXTRA_PARAMS from cmdline to build debug
 ifeq ($(EXTRA_PARAMS),)
-	EXTRA_PARAMS=-DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE
+	EXTRA_PARAMS=-DSHORT_BOARD_NAME=pth -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE
 endif
 ifeq ($(DEBUG_LEVEL_OPT),)
 	DEBUG_LEVEL_OPT = -O2
--- a/firmware/config/boards/proteus/compile_proteus_f4.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f4.sh
@ -4,6 +4,7 @@ cd ../../..

 export PROJECT_BOARD=proteus
 export PROJECT_CPU=ARCH_STM32F4
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pro

 sh config/boards/common_make.sh

--- a/firmware/config/boards/proteus/compile_proteus_f7.sh
+++ b/firmware/config/boards/proteus/compile_proteus_f7.sh
@ -6,5 +6,6 @@ export LDSCRIPT=config/boards/NUCLEO_F767/STM32F76xxI.ld

 export PROJECT_BOARD=proteus
 export PROJECT_CPU=ARCH_STM32F7
+export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pro

 sh config/boards/common_make.sh