diff --git a/firmware/config/boards/frankenso/compile_frankenso_na6.sh b/firmware/config/boards/frankenso/compile_frankenso_na6.sh index a027329de3..3687e96e24 100644 --- a/firmware/config/boards/frankenso/compile_frankenso_na6.sh +++ b/firmware/config/boards/frankenso/compile_frankenso_na6.sh @@ -5,6 +5,10 @@ cd ../../.. export EXTRA_PARAMS="-DDUMMY \ -DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF \ -DSHORT_BOARD_NAME=fra \ + \ + \ + \ + \ -DFIRMWARE_ID=\\\"frankensoNA6\\\"" sh config/boards/common_make.sh diff --git a/firmware/config/boards/frankenso/compile_frankenso_pal.sh b/firmware/config/boards/frankenso/compile_frankenso_pal.sh index 030aa1a9f9..5ba972fb54 100644 --- a/firmware/config/boards/frankenso/compile_frankenso_pal.sh +++ b/firmware/config/boards/frankenso/compile_frankenso_pal.sh @@ -3,12 +3,12 @@ cd ../../.. export EXTRA_PARAMS="-DDUMMY \ + -DDEFAULT_ENGINE_TYPE=MIATA_NA6_VAF \ + -DSHORT_BOARD_NAME=fra \ -DHAL_TRIGGER_USE_PAL=TRUE \ -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\\\"" sh config/boards/common_make.sh diff --git a/firmware/config/boards/microrusefi/compile_mre_f4.sh b/firmware/config/boards/microrusefi/compile_mre_f4.sh index 68852a0dbb..7fbee896f1 100644 --- a/firmware/config/boards/microrusefi/compile_mre_f4.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f4.sh @@ -6,4 +6,6 @@ export PROJECT_BOARD=microrusefi export PROJECT_CPU=ARCH_STM32F4 export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre + + sh config/boards/common_make.sh diff --git 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 index a9e38a0de2..4d03e46eba 100644 --- 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 @@ -4,9 +4,10 @@ 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 -DSHORT_BOARD_NAME=mre +export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST + sh config/boards/common_make.sh diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh b/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh index 4dd543acf5..566e9ff958 100644 --- a/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f4_slave.sh @@ -4,9 +4,10 @@ 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 -DSHORT_BOARD_NAME=mre +export DEFAULT_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE + sh config/boards/common_make.sh diff --git a/firmware/config/boards/microrusefi/compile_mre_f7.sh b/firmware/config/boards/microrusefi/compile_mre_f7.sh index 1a5704acc4..5e766e18d8 100644 --- a/firmware/config/boards/microrusefi/compile_mre_f7.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f7.sh @@ -2,10 +2,10 @@ cd ../../.. -export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld" - export PROJECT_BOARD=microrusefi export PROJECT_CPU=ARCH_STM32F7 export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre +export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld" + sh config/boards/common_make.sh diff --git a/firmware/config/boards/microrusefi/compile_mre_f7_test.sh b/firmware/config/boards/microrusefi/compile_mre_f7_test.sh index 31c28b8b2f..11d55c4c75 100644 --- a/firmware/config/boards/microrusefi/compile_mre_f7_test.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f7_test.sh @@ -2,11 +2,10 @@ cd ../../.. -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 +export DEFAULT_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST" +export LDSCRIPT="config/boards/NUCLEO_F767/STM32F76xxI.ld" sh config/boards/common_make.sh diff --git a/firmware/config/boards/prometheus/compile_prometheus_405.sh b/firmware/config/boards/prometheus/compile_prometheus_405.sh index 5318e36b74..95c2f76836 100644 --- a/firmware/config/boards/prometheus/compile_prometheus_405.sh +++ b/firmware/config/boards/prometheus/compile_prometheus_405.sh @@ -6,5 +6,6 @@ cd ../../.. export PROJECT_BOARD=prometheus/f405 export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pth + sh config/boards/common_make.sh diff --git a/firmware/config/boards/prometheus/compile_prometheus_469.sh b/firmware/config/boards/prometheus/compile_prometheus_469.sh index 1e8df314e6..cb2fb50a6a 100644 --- a/firmware/config/boards/prometheus/compile_prometheus_469.sh +++ b/firmware/config/boards/prometheus/compile_prometheus_469.sh @@ -4,8 +4,8 @@ cd ../../.. export PROJECT_BOARD=prometheus/f469 -export USE_BOOTLOADER=yes export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pth +export USE_BOOTLOADER=yes sh config/boards/common_make.sh diff --git a/firmware/config/boards/proteus/compile_proteus_f4.sh b/firmware/config/boards/proteus/compile_proteus_f4.sh index 4bd55880d8..7c1aa3dc52 100644 --- a/firmware/config/boards/proteus/compile_proteus_f4.sh +++ b/firmware/config/boards/proteus/compile_proteus_f4.sh @@ -6,5 +6,6 @@ export PROJECT_BOARD=proteus export PROJECT_CPU=ARCH_STM32F4 export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pro -sh config/boards/common_make.sh + +sh config/boards/common_make.sh diff --git a/firmware/config/boards/proteus/compile_proteus_f7.sh b/firmware/config/boards/proteus/compile_proteus_f7.sh index 065ec0b6d6..81db1e1e7c 100644 --- a/firmware/config/boards/proteus/compile_proteus_f7.sh +++ b/firmware/config/boards/proteus/compile_proteus_f7.sh @@ -2,10 +2,10 @@ cd ../../.. -export LDSCRIPT=config/boards/NUCLEO_F767/STM32F76xxI.ld - export PROJECT_BOARD=proteus export PROJECT_CPU=ARCH_STM32F7 export EXTRA_PARAMS=-DSHORT_BOARD_NAME=pro +export LDSCRIPT=config/boards/NUCLEO_F767/STM32F76xxI.ld + sh config/boards/common_make.sh diff --git a/firmware/config/boards/readme.md b/firmware/config/boards/readme.md index 5f0b4e9f96..95c7690ac0 100644 --- a/firmware/config/boards/readme.md +++ b/firmware/config/boards/readme.md @@ -1,4 +1,8 @@ See [misc/jenkins/compile_other_versions/run.bat](misc/jenkins/compile_other_versions/run.bat) which is executed by build server. -See https://rusefi.com/build_server/ \ No newline at end of file +See https://rusefi.com/build_server/ + +By definition, BOARD_NAME is a folder in firmware\config\boards + +One BOARD_NAME could be producing a number of artifacts via compile_$BUNDLE_NAME.sh scripts \ No newline at end of file