From 526477fc9ffd6c0be57364f1db819e3664dc4f12 Mon Sep 17 00:00:00 2001 From: David Holdeman Date: Wed, 14 Feb 2024 17:52:30 -0600 Subject: [PATCH] name meta-info.env files according to build target --- firmware/config/boards/f407-discovery/compile_f407-discovery.sh | 2 +- .../boards/f407-discovery/compile_f407-discovery_debug.sh | 2 +- .../{meta-info.env => meta-info-f407-discovery.env} | 0 .../boards/f407-discovery/meta-info-f407-discovery_debug.env | 2 ++ .../config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh | 2 +- .../boards/hellen/alphax-4chan/compile_alphax-4chan_f7.sh | 2 +- .../{meta-info_f4.env => meta-info-alphax-4chan.env} | 0 .../{meta-info_f7.env => meta-info-alphax-4chan_f7.env} | 0 .../config/boards/hellen/alphax-8chan/compile_alphax-8chan.sh | 2 +- .../boards/hellen/alphax-8chan/compile_alphax-8chan_debug.sh | 2 +- .../boards/hellen/alphax-8chan/compile_alphax-8chan_f7.sh | 2 +- .../{meta-info_f4.env => meta-info-alphax-8chan.env} | 0 .../boards/hellen/alphax-8chan/meta-info-alphax-8chan_debug.env | 2 ++ .../{meta-info_f7.env => meta-info-alphax-8chan_f7.env} | 0 .../config/boards/hellen/hellen-112-17/compile_hellen-112-17.sh | 2 +- .../boards/hellen/hellen-112-17/compile_hellen-112-17_debug.sh | 2 +- .../{meta-info.env => meta-info-hellen-112-17.env} | 0 .../hellen/hellen-112-17/meta-info-hellen-112-17_debug.env | 2 ++ .../boards/hellen/hellen-honda-k/compile_hellen-honda-k.sh | 2 +- .../hellen/hellen-honda-k/compile_hellen-honda-k_debug.sh | 2 +- .../{meta-info.env => meta-info-hellen-honda-k.env} | 0 .../hellen/hellen-honda-k/meta-info-hellen-honda-k_debug.env | 2 ++ .../boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh | 2 +- .../hellen/hellen154hyundai/compile_hellen154hyundai_f7.sh | 2 +- .../{meta-info_f4.env => meta-info-hellen154hyundai.env} | 0 .../{meta-info_f7.env => meta-info-hellen154hyundai_f7.env} | 0 .../config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh | 2 +- .../config/boards/hellen/hellen88bmw/compile_hellen88bmw_avr.sh | 2 +- .../hellen88bmw/{meta-info.env => meta-info-hellen88bmw.env} | 0 .../boards/hellen/hellen88bmw/meta-info-hellen88bmw_avr.env | 2 ++ .../boards/hellen/small-can-board/compile_small-can-board.sh | 2 +- .../hellen/small-can-board/compile_small-can-board_debug.sh | 2 +- .../{meta-info.env => meta-info-small-can-board.env} | 0 .../hellen/small-can-board/meta-info-small-can-board_debug.env | 2 ++ firmware/config/boards/microrusefi/compile_mre_f4.sh | 2 +- firmware/config/boards/microrusefi/compile_mre_f7.sh | 2 +- .../microrusefi/{meta-info_f4.env => meta-info-mre_f4.env} | 0 .../microrusefi/{meta-info_f7.env => meta-info-mre_f7.env} | 0 firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh | 2 +- .../config/boards/nucleo_f767/compile_stm32f767_nucleo_debug.sh | 2 +- firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh | 2 +- .../{meta-info.env => meta-info-stm32f767_nucleo.env} | 0 .../boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env | 2 ++ firmware/config/boards/nucleo_f767/meta-info-stm32f767_osc.env | 2 ++ firmware/config/boards/proteus/compile_proteus_f4.sh | 2 +- firmware/config/boards/proteus/compile_proteus_f4_debug.sh | 2 +- .../proteus/compile_proteus_f4_hardware_QC_special_build.sh | 2 +- firmware/config/boards/proteus/compile_proteus_f7.sh | 2 +- firmware/config/boards/proteus/compile_proteus_f7_debug.sh | 2 +- .../proteus/compile_proteus_f7_hardware_QC_special_build.sh | 2 +- firmware/config/boards/proteus/compile_proteus_h7.sh | 2 +- firmware/config/boards/proteus/compile_proteus_h7_debug.sh | 2 +- firmware/config/boards/proteus/compile_proteus_legacy.sh | 2 +- .../proteus/{meta-info_f4.env => meta-info-proteus_f4.env} | 0 firmware/config/boards/proteus/meta-info-proteus_f4_debug.env | 2 ++ .../proteus/meta-info-proteus_f4_hardware_QC_special_build.env | 2 ++ .../proteus/{meta-info_f7.env => meta-info-proteus_f7.env} | 0 firmware/config/boards/proteus/meta-info-proteus_f7_debug.env | 2 ++ .../proteus/meta-info-proteus_f7_hardware_QC_special_build.env | 2 ++ .../proteus/{meta-info_h7.env => meta-info-proteus_h7.env} | 0 firmware/config/boards/proteus/meta-info-proteus_h7_debug.env | 2 ++ firmware/config/boards/proteus/meta-info-proteus_legacy.env | 2 ++ firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh | 2 +- .../config/boards/subaru_eg33/compile_subaru_eg33_f7_no_bl.sh | 2 +- .../subaru_eg33/{meta-info.env => meta-info-subaru_eg33_f7.env} | 0 .../boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env | 2 ++ 66 files changed, 63 insertions(+), 33 deletions(-) rename firmware/config/boards/f407-discovery/{meta-info.env => meta-info-f407-discovery.env} (100%) create mode 100644 firmware/config/boards/f407-discovery/meta-info-f407-discovery_debug.env rename firmware/config/boards/hellen/alphax-4chan/{meta-info_f4.env => meta-info-alphax-4chan.env} (100%) rename firmware/config/boards/hellen/alphax-4chan/{meta-info_f7.env => meta-info-alphax-4chan_f7.env} (100%) rename firmware/config/boards/hellen/alphax-8chan/{meta-info_f4.env => meta-info-alphax-8chan.env} (100%) create mode 100644 firmware/config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_debug.env rename firmware/config/boards/hellen/alphax-8chan/{meta-info_f7.env => meta-info-alphax-8chan_f7.env} (100%) rename firmware/config/boards/hellen/hellen-112-17/{meta-info.env => meta-info-hellen-112-17.env} (100%) create mode 100644 firmware/config/boards/hellen/hellen-112-17/meta-info-hellen-112-17_debug.env rename firmware/config/boards/hellen/hellen-honda-k/{meta-info.env => meta-info-hellen-honda-k.env} (100%) create mode 100644 firmware/config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k_debug.env rename firmware/config/boards/hellen/hellen154hyundai/{meta-info_f4.env => meta-info-hellen154hyundai.env} (100%) rename firmware/config/boards/hellen/hellen154hyundai/{meta-info_f7.env => meta-info-hellen154hyundai_f7.env} (100%) rename firmware/config/boards/hellen/hellen88bmw/{meta-info.env => meta-info-hellen88bmw.env} (100%) create mode 100644 firmware/config/boards/hellen/hellen88bmw/meta-info-hellen88bmw_avr.env rename firmware/config/boards/hellen/small-can-board/{meta-info.env => meta-info-small-can-board.env} (100%) create mode 100644 firmware/config/boards/hellen/small-can-board/meta-info-small-can-board_debug.env rename firmware/config/boards/microrusefi/{meta-info_f4.env => meta-info-mre_f4.env} (100%) rename firmware/config/boards/microrusefi/{meta-info_f7.env => meta-info-mre_f7.env} (100%) rename firmware/config/boards/nucleo_f767/{meta-info.env => meta-info-stm32f767_nucleo.env} (100%) create mode 100644 firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env create mode 100644 firmware/config/boards/nucleo_f767/meta-info-stm32f767_osc.env rename firmware/config/boards/proteus/{meta-info_f4.env => meta-info-proteus_f4.env} (100%) create mode 100644 firmware/config/boards/proteus/meta-info-proteus_f4_debug.env create mode 100644 firmware/config/boards/proteus/meta-info-proteus_f4_hardware_QC_special_build.env rename firmware/config/boards/proteus/{meta-info_f7.env => meta-info-proteus_f7.env} (100%) create mode 100644 firmware/config/boards/proteus/meta-info-proteus_f7_debug.env create mode 100644 firmware/config/boards/proteus/meta-info-proteus_f7_hardware_QC_special_build.env rename firmware/config/boards/proteus/{meta-info_h7.env => meta-info-proteus_h7.env} (100%) create mode 100644 firmware/config/boards/proteus/meta-info-proteus_h7_debug.env create mode 100644 firmware/config/boards/proteus/meta-info-proteus_legacy.env rename firmware/config/boards/subaru_eg33/{meta-info.env => meta-info-subaru_eg33_f7.env} (100%) create mode 100644 firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env diff --git a/firmware/config/boards/f407-discovery/compile_f407-discovery.sh b/firmware/config/boards/f407-discovery/compile_f407-discovery.sh index 2fa82fd3a2..151385e204 100755 --- a/firmware/config/boards/f407-discovery/compile_f407-discovery.sh +++ b/firmware/config/boards/f407-discovery/compile_f407-discovery.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/f407-discovery/meta-info.env +bash ../common_make.sh config/boards/f407-discovery/meta-info-f407-discovery.env diff --git a/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh b/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh index fb7b49dfa9..f6db8b27f3 100755 --- a/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh +++ b/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh @@ -9,4 +9,4 @@ export EXTRA_PARAMS="\ -DRAMDISK_INVALID" export DEBUG_LEVEL_OPT="-O0 -ggdb -g" export INCLUDE_ELF=yes -bash ../common_make.sh config/boards/f407-discovery/meta-info.env +bash ../common_make.sh config/boards/f407-discovery/meta-info-f407-discovery_debug.env diff --git a/firmware/config/boards/f407-discovery/meta-info.env b/firmware/config/boards/f407-discovery/meta-info-f407-discovery.env similarity index 100% rename from firmware/config/boards/f407-discovery/meta-info.env rename to firmware/config/boards/f407-discovery/meta-info-f407-discovery.env diff --git a/firmware/config/boards/f407-discovery/meta-info-f407-discovery_debug.env b/firmware/config/boards/f407-discovery/meta-info-f407-discovery_debug.env new file mode 100644 index 0000000000..0a3faae297 --- /dev/null +++ b/firmware/config/boards/f407-discovery/meta-info-f407-discovery_debug.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=f407-discovery +BOARD_CPU=ARCH_STM32F4 diff --git a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh index 0b29d600d9..62f8e89cd7 100755 --- a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh +++ b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/alphax-4chan/meta-info_f4.env +bash ../common_make.sh config/boards/hellen/alphax-4chan/meta-info-alphax-4chan.env diff --git a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan_f7.sh b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan_f7.sh index 1f4880c8cc..c8d4736a41 100755 --- a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan_f7.sh +++ b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan_f7.sh @@ -3,4 +3,4 @@ export USE_OPENBLT=yes cd .. -bash ../common_make.sh config/boards/hellen/alphax-4chan/meta-info_f7.env +bash ../common_make.sh config/boards/hellen/alphax-4chan/meta-info-alphax-4chan_f7.env diff --git a/firmware/config/boards/hellen/alphax-4chan/meta-info_f4.env b/firmware/config/boards/hellen/alphax-4chan/meta-info-alphax-4chan.env similarity index 100% rename from firmware/config/boards/hellen/alphax-4chan/meta-info_f4.env rename to firmware/config/boards/hellen/alphax-4chan/meta-info-alphax-4chan.env diff --git a/firmware/config/boards/hellen/alphax-4chan/meta-info_f7.env b/firmware/config/boards/hellen/alphax-4chan/meta-info-alphax-4chan_f7.env similarity index 100% rename from firmware/config/boards/hellen/alphax-4chan/meta-info_f7.env rename to firmware/config/boards/hellen/alphax-4chan/meta-info-alphax-4chan_f7.env diff --git a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan.sh b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan.sh index cc7ece8277..10fb1d3c7f 100755 --- a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan.sh +++ b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/alphax-8chan/meta-info_f4.env +bash ../common_make.sh config/boards/hellen/alphax-8chan/meta-info-alphax-8chan.env diff --git a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_debug.sh b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_debug.sh index 1810253c61..4cac3f669d 100755 --- a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_debug.sh +++ b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_debug.sh @@ -4,4 +4,4 @@ export EXTRA_PARAMS="-DRAMDISK_INVALID -DEFI_LUA=FALSE" export DEBUG_LEVEL_OPT="-O0 -ggdb -g" export INCLUDE_ELF=yes cd .. -bash ../common_make.sh config/boards/hellen/alphax-8chan/meta-info_f4.env +bash ../common_make.sh config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_debug.env diff --git a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_f7.sh b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_f7.sh index 2a17571a19..4ba7b13782 100755 --- a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_f7.sh +++ b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_f7.sh @@ -3,4 +3,4 @@ # export USE_OPENBLT=yes cd .. -bash ../common_make.sh config/boards/hellen/alphax-8chan/meta-info_f7.env +bash ../common_make.sh config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_f7.env diff --git a/firmware/config/boards/hellen/alphax-8chan/meta-info_f4.env b/firmware/config/boards/hellen/alphax-8chan/meta-info-alphax-8chan.env similarity index 100% rename from firmware/config/boards/hellen/alphax-8chan/meta-info_f4.env rename to firmware/config/boards/hellen/alphax-8chan/meta-info-alphax-8chan.env diff --git a/firmware/config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_debug.env b/firmware/config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_debug.env new file mode 100644 index 0000000000..6fa694fe32 --- /dev/null +++ b/firmware/config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_debug.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=alphax-8chan +BOARD_CPU=ARCH_STM32F4 diff --git a/firmware/config/boards/hellen/alphax-8chan/meta-info_f7.env b/firmware/config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_f7.env similarity index 100% rename from firmware/config/boards/hellen/alphax-8chan/meta-info_f7.env rename to firmware/config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_f7.env diff --git a/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17.sh b/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17.sh index a22a67faf3..52fd8dd995 100755 --- a/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17.sh +++ b/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen-112-17/meta-info.env \ No newline at end of file +bash ../common_make.sh config/boards/hellen/hellen-112-17/meta-info-hellen-112-17.env \ No newline at end of file diff --git a/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17_debug.sh b/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17_debug.sh index 4fea1f0f53..f477f9b314 100755 --- a/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17_debug.sh +++ b/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17_debug.sh @@ -5,4 +5,4 @@ export DEBUG_LEVEL_OPT="-O0 -ggdb -g" export INCLUDE_ELF=yes cd .. -bash ../common_make.sh config/boards/hellen/hellen-112-17/meta-info.env +bash ../common_make.sh config/boards/hellen/hellen-112-17/meta-info-hellen-112-17_debug.env diff --git a/firmware/config/boards/hellen/hellen-112-17/meta-info.env b/firmware/config/boards/hellen/hellen-112-17/meta-info-hellen-112-17.env similarity index 100% rename from firmware/config/boards/hellen/hellen-112-17/meta-info.env rename to firmware/config/boards/hellen/hellen-112-17/meta-info-hellen-112-17.env diff --git a/firmware/config/boards/hellen/hellen-112-17/meta-info-hellen-112-17_debug.env b/firmware/config/boards/hellen/hellen-112-17/meta-info-hellen-112-17_debug.env new file mode 100644 index 0000000000..cb06a88e37 --- /dev/null +++ b/firmware/config/boards/hellen/hellen-112-17/meta-info-hellen-112-17_debug.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=hellen-112-17 +BOARD_CPU=ARCH_STM32F4 diff --git a/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k.sh b/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k.sh index 63d50a813e..18c15bdf2f 100755 --- a/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k.sh +++ b/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen-honda-k/meta-info.env +bash ../common_make.sh config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k.env diff --git a/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k_debug.sh b/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k_debug.sh index ed6fa63132..a87c8a8843 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k_debug.sh +++ b/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k_debug.sh @@ -10,4 +10,4 @@ export EXTRA_PARAMS="\ export DEBUG_LEVEL_OPT="-O0 -ggdb -g" export INCLUDE_ELF=yes cd .. -bash ../common_make.sh config/boards/hellen/hellen-honda-k/meta-info.env +bash ../common_make.sh config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k_debug.env diff --git a/firmware/config/boards/hellen/hellen-honda-k/meta-info.env b/firmware/config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k.env similarity index 100% rename from firmware/config/boards/hellen/hellen-honda-k/meta-info.env rename to firmware/config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k.env diff --git a/firmware/config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k_debug.env b/firmware/config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k_debug.env new file mode 100644 index 0000000000..7b8e9c1a63 --- /dev/null +++ b/firmware/config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k_debug.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=hellen-honda-k +BOARD_CPU=ARCH_STM32F4 diff --git a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh index 863e82a834..fa8d7f70f0 100755 --- a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh +++ b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen154hyundai/meta-info_f4.env +bash ../common_make.sh config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai.env diff --git a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai_f7.sh b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai_f7.sh index 353042ddc7..ab508dcd36 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai_f7.sh +++ b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai_f7.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen154hyundai/meta-info_f7.env +bash ../common_make.sh config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai_f7.env diff --git a/firmware/config/boards/hellen/hellen154hyundai/meta-info_f4.env b/firmware/config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai.env similarity index 100% rename from firmware/config/boards/hellen/hellen154hyundai/meta-info_f4.env rename to firmware/config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai.env diff --git a/firmware/config/boards/hellen/hellen154hyundai/meta-info_f7.env b/firmware/config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai_f7.env similarity index 100% rename from firmware/config/boards/hellen/hellen154hyundai/meta-info_f7.env rename to firmware/config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai_f7.env diff --git a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh index 0af9d33d39..6d3a102d2d 100755 --- a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh +++ b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh @@ -6,4 +6,4 @@ export EXTRA_PARAMS="\ -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE \ " -bash ../common_make.sh config/boards/hellen/hellen88bmw/meta-info.env +bash ../common_make.sh config/boards/hellen/hellen88bmw/meta-info-hellen88bmw.env diff --git a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw_avr.sh b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw_avr.sh index 3e0e91e8a5..4c320d91d4 100644 --- a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw_avr.sh +++ b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw_avr.sh @@ -8,4 +8,4 @@ export EXTRA_PARAMS="\ -DSTM32_ADC_USE_ADC3=TRUE \ " -bash ../common_make.sh config/boards/hellen/hellen88bmw/meta-info.env +bash ../common_make.sh config/boards/hellen/hellen88bmw/meta-info-hellen88bmw_avr.env diff --git a/firmware/config/boards/hellen/hellen88bmw/meta-info.env b/firmware/config/boards/hellen/hellen88bmw/meta-info-hellen88bmw.env similarity index 100% rename from firmware/config/boards/hellen/hellen88bmw/meta-info.env rename to firmware/config/boards/hellen/hellen88bmw/meta-info-hellen88bmw.env diff --git a/firmware/config/boards/hellen/hellen88bmw/meta-info-hellen88bmw_avr.env b/firmware/config/boards/hellen/hellen88bmw/meta-info-hellen88bmw_avr.env new file mode 100644 index 0000000000..ab12057387 --- /dev/null +++ b/firmware/config/boards/hellen/hellen88bmw/meta-info-hellen88bmw_avr.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=hellen88bmw +BOARD_CPU=ARCH_STM32F4 diff --git a/firmware/config/boards/hellen/small-can-board/compile_small-can-board.sh b/firmware/config/boards/hellen/small-can-board/compile_small-can-board.sh index c39bf47bc7..2da31f10f7 100755 --- a/firmware/config/boards/hellen/small-can-board/compile_small-can-board.sh +++ b/firmware/config/boards/hellen/small-can-board/compile_small-can-board.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/small-can-board/meta-info.env +bash ../common_make.sh config/boards/hellen/small-can-board/meta-info-small-can-board.env diff --git a/firmware/config/boards/hellen/small-can-board/compile_small-can-board_debug.sh b/firmware/config/boards/hellen/small-can-board/compile_small-can-board_debug.sh index 8a41da259d..94759db135 100644 --- a/firmware/config/boards/hellen/small-can-board/compile_small-can-board_debug.sh +++ b/firmware/config/boards/hellen/small-can-board/compile_small-can-board_debug.sh @@ -10,4 +10,4 @@ export EXTRA_PARAMS="\ export DEBUG_LEVEL_OPT="-O0 -ggdb -g" export INCLUDE_ELF=yes cd .. -bash ../common_make.sh config/boards/hellen/small-can-board/meta-info.env +bash ../common_make.sh config/boards/hellen/small-can-board/meta-info-small-can-board_debug.env diff --git a/firmware/config/boards/hellen/small-can-board/meta-info.env b/firmware/config/boards/hellen/small-can-board/meta-info-small-can-board.env similarity index 100% rename from firmware/config/boards/hellen/small-can-board/meta-info.env rename to firmware/config/boards/hellen/small-can-board/meta-info-small-can-board.env diff --git a/firmware/config/boards/hellen/small-can-board/meta-info-small-can-board_debug.env b/firmware/config/boards/hellen/small-can-board/meta-info-small-can-board_debug.env new file mode 100644 index 0000000000..d3a529e4cc --- /dev/null +++ b/firmware/config/boards/hellen/small-can-board/meta-info-small-can-board_debug.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=small-can-board +BOARD_CPU=ARCH_STM32F4 diff --git a/firmware/config/boards/microrusefi/compile_mre_f4.sh b/firmware/config/boards/microrusefi/compile_mre_f4.sh index e38691501e..cf8058145f 100755 --- a/firmware/config/boards/microrusefi/compile_mre_f4.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f4.sh @@ -7,4 +7,4 @@ export USE_OPENBLT=yes -bash ../common_make.sh config/boards/microrusefi/meta-info_f4.env +bash ../common_make.sh config/boards/microrusefi/meta-info-mre_f4.env diff --git a/firmware/config/boards/microrusefi/compile_mre_f7.sh b/firmware/config/boards/microrusefi/compile_mre_f7.sh index 23e943dc02..aea57697c9 100755 --- a/firmware/config/boards/microrusefi/compile_mre_f7.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f7.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/microrusefi/meta-info_f7.env +bash ../common_make.sh config/boards/microrusefi/meta-info-mre_f7.env diff --git a/firmware/config/boards/microrusefi/meta-info_f4.env b/firmware/config/boards/microrusefi/meta-info-mre_f4.env similarity index 100% rename from firmware/config/boards/microrusefi/meta-info_f4.env rename to firmware/config/boards/microrusefi/meta-info-mre_f4.env diff --git a/firmware/config/boards/microrusefi/meta-info_f7.env b/firmware/config/boards/microrusefi/meta-info-mre_f7.env similarity index 100% rename from firmware/config/boards/microrusefi/meta-info_f7.env rename to firmware/config/boards/microrusefi/meta-info-mre_f7.env diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh index ccf99c665a..a39ab03c52 100755 --- a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh +++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh @@ -15,4 +15,4 @@ export EXTRA_PARAMS="-DSTM32F767xx \ -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" -bash ../common_make.sh config/boards/nucleo_f767/meta-info.env +bash ../common_make.sh config/boards/nucleo_f767/meta-info-stm32f767_nucleo.env diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo_debug.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo_debug.sh index 2233cec8ad..38dc6166b5 100644 --- a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo_debug.sh +++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo_debug.sh @@ -19,4 +19,4 @@ export EXTRA_PARAMS="-DEFI_LUA=FALSE" export DEBUG_LEVEL_OPT="-O0 -ggdb -g -Wl,--defsym=FLASH_SIZE=768k" export INCLUDE_ELF=yes -bash ../common_make.sh config/boards/nucleo_f767/meta-info.env +bash ../common_make.sh config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh index d29e3d50d5..7d39856842 100755 --- a/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh +++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh @@ -15,4 +15,4 @@ export EXTRA_PARAMS="-DSTM32F767xx \ -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" -bash ../common_make.sh config/boards/nucleo_f767/meta-info.env +bash ../common_make.sh config/boards/nucleo_f767/meta-info-stm32f767_osc.env diff --git a/firmware/config/boards/nucleo_f767/meta-info.env b/firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo.env similarity index 100% rename from firmware/config/boards/nucleo_f767/meta-info.env rename to firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo.env diff --git a/firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env b/firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env new file mode 100644 index 0000000000..f31ffc1d7f --- /dev/null +++ b/firmware/config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=stm32f767_nucleo +BOARD_CPU=ARCH_STM32F7 diff --git a/firmware/config/boards/nucleo_f767/meta-info-stm32f767_osc.env b/firmware/config/boards/nucleo_f767/meta-info-stm32f767_osc.env new file mode 100644 index 0000000000..f31ffc1d7f --- /dev/null +++ b/firmware/config/boards/nucleo_f767/meta-info-stm32f767_osc.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=stm32f767_nucleo +BOARD_CPU=ARCH_STM32F7 diff --git a/firmware/config/boards/proteus/compile_proteus_f4.sh b/firmware/config/boards/proteus/compile_proteus_f4.sh index 94b1cc1498..ee527446ed 100755 --- a/firmware/config/boards/proteus/compile_proteus_f4.sh +++ b/firmware/config/boards/proteus/compile_proteus_f4.sh @@ -2,4 +2,4 @@ export USE_OPENBLT=yes -bash ../common_make.sh config/boards/proteus/meta-info_f4.env +bash ../common_make.sh config/boards/proteus/meta-info-proteus_f4.env diff --git a/firmware/config/boards/proteus/compile_proteus_f4_debug.sh b/firmware/config/boards/proteus/compile_proteus_f4_debug.sh index 58d8cb6e52..87cdce47b5 100644 --- a/firmware/config/boards/proteus/compile_proteus_f4_debug.sh +++ b/firmware/config/boards/proteus/compile_proteus_f4_debug.sh @@ -17,4 +17,4 @@ export EXTRA_PARAMS="\ -DRAMDISK_INVALID" export DEBUG_LEVEL_OPT="-O0 -ggdb -g" export INCLUDE_ELF=yes -bash ../common_make.sh config/boards/proteus/meta-info_f4.env +bash ../common_make.sh config/boards/proteus/meta-info-proteus_f4_debug.env diff --git a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh index 67fe4c20a9..43588ed4cc 100755 --- a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh +++ b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh @@ -6,4 +6,4 @@ export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=engine_type_e::PROTEUS_QC_TEST_ # export DEBUG_LEVEL_OPT="-O0 -ggdb -g" -bash ../common_make.sh config/boards/proteus/meta-info_f4.env +bash ../common_make.sh config/boards/proteus/meta-info-proteus_f4_hardware_QC_special_build.env diff --git a/firmware/config/boards/proteus/compile_proteus_f7.sh b/firmware/config/boards/proteus/compile_proteus_f7.sh index f4fa0140d1..22979cb326 100755 --- a/firmware/config/boards/proteus/compile_proteus_f7.sh +++ b/firmware/config/boards/proteus/compile_proteus_f7.sh @@ -3,4 +3,4 @@ export USE_OPENBLT=yes export DEBUG_LEVEL_OPT="-Os -ggdb -g" -bash ../common_make.sh config/boards/proteus/meta-info_f7.env +bash ../common_make.sh config/boards/proteus/meta-info-proteus_f7.env diff --git a/firmware/config/boards/proteus/compile_proteus_f7_debug.sh b/firmware/config/boards/proteus/compile_proteus_f7_debug.sh index 4a24e1436e..e31dcbaa35 100755 --- a/firmware/config/boards/proteus/compile_proteus_f7_debug.sh +++ b/firmware/config/boards/proteus/compile_proteus_f7_debug.sh @@ -3,4 +3,4 @@ export EXTRA_PARAMS="-DEFI_LUA=FALSE" export DEBUG_LEVEL_OPT="-O0 -ggdb -g -Wl,--defsym=FLASH_SIZE=768k" export INCLUDE_ELF=yes -bash ../common_make.sh config/boards/proteus/meta-info_f7.env +bash ../common_make.sh config/boards/proteus/meta-info-proteus_f7_debug.env diff --git a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh index dfb2abd524..52a42c42c5 100755 --- a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh +++ b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh @@ -6,4 +6,4 @@ export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=engine_type_e::PROTEUS_QC_TEST_ export DEBUG_LEVEL_OPT="-Os -ggdb -g" -bash ../common_make.sh config/boards/proteus/meta-info_f7.env +bash ../common_make.sh config/boards/proteus/meta-info-proteus_f7_hardware_QC_special_build.env diff --git a/firmware/config/boards/proteus/compile_proteus_h7.sh b/firmware/config/boards/proteus/compile_proteus_h7.sh index e19a15c106..1f3994f5ec 100755 --- a/firmware/config/boards/proteus/compile_proteus_h7.sh +++ b/firmware/config/boards/proteus/compile_proteus_h7.sh @@ -2,4 +2,4 @@ # export USE_OPENBLT=yes -bash ../common_make.sh config/boards/proteus/meta-info_h7.env +bash ../common_make.sh config/boards/proteus/meta-info-proteus_h7.env diff --git a/firmware/config/boards/proteus/compile_proteus_h7_debug.sh b/firmware/config/boards/proteus/compile_proteus_h7_debug.sh index 21f2edead6..6a02c55ec4 100644 --- a/firmware/config/boards/proteus/compile_proteus_h7_debug.sh +++ b/firmware/config/boards/proteus/compile_proteus_h7_debug.sh @@ -2,4 +2,4 @@ export DEBUG_LEVEL_OPT="-O0 -ggdb -g" export INCLUDE_ELF=yes -bash ../common_make.sh config/boards/proteus/meta-info_h7.env +bash ../common_make.sh config/boards/proteus/meta-info-proteus_h7_debug.env diff --git a/firmware/config/boards/proteus/compile_proteus_legacy.sh b/firmware/config/boards/proteus/compile_proteus_legacy.sh index 8af0bc4de4..14f49e7de6 100755 --- a/firmware/config/boards/proteus/compile_proteus_legacy.sh +++ b/firmware/config/boards/proteus/compile_proteus_legacy.sh @@ -4,4 +4,4 @@ export PROTEUS_LEGACY=TRUE -bash ../common_make.sh config/boards/proteus/meta-info_f7.env +bash ../common_make.sh config/boards/proteus/meta-info-proteus_legacy.env diff --git a/firmware/config/boards/proteus/meta-info_f4.env b/firmware/config/boards/proteus/meta-info-proteus_f4.env similarity index 100% rename from firmware/config/boards/proteus/meta-info_f4.env rename to firmware/config/boards/proteus/meta-info-proteus_f4.env diff --git a/firmware/config/boards/proteus/meta-info-proteus_f4_debug.env b/firmware/config/boards/proteus/meta-info-proteus_f4_debug.env new file mode 100644 index 0000000000..a1803ca26b --- /dev/null +++ b/firmware/config/boards/proteus/meta-info-proteus_f4_debug.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=proteus_f4 +BOARD_CPU=ARCH_STM32F4 diff --git a/firmware/config/boards/proteus/meta-info-proteus_f4_hardware_QC_special_build.env b/firmware/config/boards/proteus/meta-info-proteus_f4_hardware_QC_special_build.env new file mode 100644 index 0000000000..a1803ca26b --- /dev/null +++ b/firmware/config/boards/proteus/meta-info-proteus_f4_hardware_QC_special_build.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=proteus_f4 +BOARD_CPU=ARCH_STM32F4 diff --git a/firmware/config/boards/proteus/meta-info_f7.env b/firmware/config/boards/proteus/meta-info-proteus_f7.env similarity index 100% rename from firmware/config/boards/proteus/meta-info_f7.env rename to firmware/config/boards/proteus/meta-info-proteus_f7.env diff --git a/firmware/config/boards/proteus/meta-info-proteus_f7_debug.env b/firmware/config/boards/proteus/meta-info-proteus_f7_debug.env new file mode 100644 index 0000000000..4f09d10346 --- /dev/null +++ b/firmware/config/boards/proteus/meta-info-proteus_f7_debug.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=proteus_f7 +BOARD_CPU=ARCH_STM32F7 diff --git a/firmware/config/boards/proteus/meta-info-proteus_f7_hardware_QC_special_build.env b/firmware/config/boards/proteus/meta-info-proteus_f7_hardware_QC_special_build.env new file mode 100644 index 0000000000..4f09d10346 --- /dev/null +++ b/firmware/config/boards/proteus/meta-info-proteus_f7_hardware_QC_special_build.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=proteus_f7 +BOARD_CPU=ARCH_STM32F7 diff --git a/firmware/config/boards/proteus/meta-info_h7.env b/firmware/config/boards/proteus/meta-info-proteus_h7.env similarity index 100% rename from firmware/config/boards/proteus/meta-info_h7.env rename to firmware/config/boards/proteus/meta-info-proteus_h7.env diff --git a/firmware/config/boards/proteus/meta-info-proteus_h7_debug.env b/firmware/config/boards/proteus/meta-info-proteus_h7_debug.env new file mode 100644 index 0000000000..0a2141863c --- /dev/null +++ b/firmware/config/boards/proteus/meta-info-proteus_h7_debug.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=proteus_h7 +BOARD_CPU=ARCH_STM32H7 diff --git a/firmware/config/boards/proteus/meta-info-proteus_legacy.env b/firmware/config/boards/proteus/meta-info-proteus_legacy.env new file mode 100644 index 0000000000..4f09d10346 --- /dev/null +++ b/firmware/config/boards/proteus/meta-info-proteus_legacy.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=proteus_f7 +BOARD_CPU=ARCH_STM32F7 diff --git a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh index 3e195c3627..7ef760ec89 100755 --- a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh +++ b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh @@ -9,4 +9,4 @@ export USE_OPENBLT=yes -bash ../common_make.sh config/boards/subaru_eg33/meta-info.env +bash ../common_make.sh config/boards/subaru_eg33/meta-info-subaru_eg33_f7.env diff --git a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7_no_bl.sh b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7_no_bl.sh index 260ac41640..9782b0c462 100644 --- a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7_no_bl.sh +++ b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7_no_bl.sh @@ -10,4 +10,4 @@ # This is no-bootloader version #export USE_OPENBLT=yes -bash ../common_make.sh config/boards/subaru_eg33/meta-info.env +bash ../common_make.sh config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env diff --git a/firmware/config/boards/subaru_eg33/meta-info.env b/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7.env similarity index 100% rename from firmware/config/boards/subaru_eg33/meta-info.env rename to firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7.env diff --git a/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env b/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env new file mode 100644 index 0000000000..b4acfbcc55 --- /dev/null +++ b/firmware/config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env @@ -0,0 +1,2 @@ +SHORT_BOARD_NAME=subaru_eg33_f7 +BOARD_CPU=ARCH_STM32F7