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

set SHORT_BOARD_NAME from mk, not shell script (#4078) 

* MRE

* proteus

* weird format lol

* alphax 4

* alphax 2ch

* prometheus, subaru

* s

* put a canary in the coal mine

* activate the sleepy canaries

* atlas

* tdg pdm

* The canary detected the problems it needed to

This reverts commit b0a3718b115f69f85f78fc4814aec04434968c0f.

* Revert "activate the sleepy canaries"

This reverts commit f80cfcdd789418caa30854064bcb9ce865eee474.

* prometheus
This commit is contained in:
Matthew Kennedy 2022-04-18 11:22:05 -07:00 committed by GitHub
parent 43b342f5cb
commit 2ee96bab90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/atlas/board.mk
View File

@ -19,3 +19,5 @@ DDEFS += -DHW_ATLAS=1
# Atlas needs networking library
LWIP = yes
DDEFS += -DEFI_ETHERNET=TRUE
DDEFS += -DSHORT_BOARD_NAME=atlas

8
firmware/config/boards/frankenso/compile_frankenso_na6.sh
View File

@ -3,13 +3,7 @@
DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=FRANKENSO_MIATA_NA6_VAF
FW_ID_ENV=frankensoNA6
export EXTRA_PARAMS="-DDUMMY \
-DSHORT_BOARD_NAME=frankenso_na6 \
\
\
\
\
"
export EXTRA_PARAMS="-DDUMMY -DSHORT_BOARD_NAME=frankenso_na6"
bash ../common_make.sh

2
firmware/config/boards/hellen/alphax-2chan/board.mk
View File

@ -17,3 +17,5 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
DDEFS += -DSHORT_BOARD_NAME=alphax-2chan

1
firmware/config/boards/hellen/alphax-2chan/compile_alphax-2chan.sh
View File

@ -2,7 +2,6 @@
export PROJECT_BOARD=hellen/alphax-2chan
export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=alphax-2chan"
cd ..
bash ../common_make.sh

1
firmware/config/boards/hellen/alphax-4chan/board.mk
View File

@ -17,3 +17,4 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
DDEFS += -DSHORT_BOARD_NAME=alphax-4chan

1
firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh
View File

@ -2,7 +2,6 @@
export PROJECT_BOARD=hellen/alphax-4chan
export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=alphax-4chan"
cd ..
bash ../common_make.sh

7
firmware/config/boards/microrusefi/board.mk
View File

@ -32,3 +32,10 @@ DDEFS += $(VAR_DEF_ENGINE_TYPE)
# We are running on microRusEFI hardware!
DDEFS += -DHW_MICRO_RUSEFI=1
ifeq ($(PROJECT_CPU),ARCH_STM32F7)
DDEFS += -DSHORT_BOARD_NAME=mre_f7
else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
DDEFS += -DSHORT_BOARD_NAME=mre_f4
else
$(error Unsupported PROJECT_CPU for microRusEFI: [$(PROJECT_CPU)])
endif

1
firmware/config/boards/microrusefi/compile_mre_f4.sh
View File

@ -2,7 +2,6 @@
export PROJECT_BOARD=microrusefi
export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=mre_f4"
# export USE_OPENBLT=yes

1
firmware/config/boards/microrusefi/compile_mre_f4_debug.sh
View File

@ -2,7 +2,6 @@
export PROJECT_BOARD=microrusefi
export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=mre_f4"
export EXTRA_PARAMS="-DRAMDISK_INVALID"
export DEBUG_LEVEL_OPT="-O0 -ggdb -g"

1
firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh
View File

@ -17,7 +17,6 @@ export EXTRA_PARAMS="-DDUMMY \
-DEFI_ENGINE_SNIFFER=FALSE \
-DEFI_LAUNCH_CONTROL=FALSE \
-DHW_CHECK_ALWAYS_STIMULATE=TRUE \
-DSHORT_BOARD_NAME=mre_f4 \
-DRAMDISK_INVALID"
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST

2
firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh
View File

@ -2,7 +2,7 @@
export PROJECT_BOARD=microrusefi
export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=mre_f4 -DIGNORE_FLASH_CONFIGURATION=TRUE"
export EXTRA_PARAMS="-DIGNORE_FLASH_CONFIGURATION=TRUE"
# export DEBUG_LEVEL_OPT="-O0 -ggdb -g"

2
firmware/config/boards/microrusefi/compile_mre_f4_slave.sh
View File

@ -2,7 +2,7 @@
export PROJECT_BOARD=microrusefi
export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE -DSHORT_BOARD_NAME=mre_f4
export EXTRA_PARAMS=-DDUMMY -DEFI_CANBUS_SLAVE=TRUE
export VAR_DEF_ENGINE_TYPE = -DDEFAULT_ENGINE_TYPE=BMW_M73_MRE_SLAVE

1
firmware/config/boards/microrusefi/compile_mre_f7.sh
View File

@ -2,6 +2,5 @@
export PROJECT_BOARD=microrusefi
export PROJECT_CPU=ARCH_STM32F7
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=mre_f7"
bash ../common_make.sh

1
firmware/config/boards/microrusefi/compile_mre_f7_test.sh
View File

@ -2,7 +2,6 @@
export PROJECT_BOARD=microrusefi
export PROJECT_CPU=ARCH_STM32F7
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=mre_f7
export VAR_DEF_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=MRE_BOARD_TEST"
bash ../common_make.sh

2
firmware/config/boards/prometheus/compile_prometheus_405.sh
View File

@ -3,8 +3,6 @@
# STM32F405 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215
export PROJECT_BOARD=prometheus/f405
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=prometheus_405
bash ../common_make.sh

1
firmware/config/boards/prometheus/compile_prometheus_469.sh
View File

@ -3,7 +3,6 @@
# STM32F469 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215
export PROJECT_BOARD=prometheus/f469
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=prometheus_469
export USE_BOOTLOADER=yes
bash ../common_make.sh

6
firmware/config/boards/prometheus/prometheus-common.mk
View File

@ -14,14 +14,14 @@ 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 = -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
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
endif
ifeq ($(DEBUG_LEVEL_OPT),)
DEBUG_LEVEL_OPT = -O2
endif
ifeq ($(PROMETHEUS_BOARD),405)
DDEFS += -DFIRMWARE_ID=\"prometeus405\"
DDEFS += -DFIRMWARE_ID=\"prometeus405\" -DSHORT_BOARD_NAME=prometheus_405
else
DDEFS += -DFIRMWARE_ID=\"prometeus469\"
DDEFS += -DFIRMWARE_ID=\"prometeus469\" -DSHORT_BOARD_NAME=prometheus_469
endif

10
firmware/config/boards/proteus/board.mk
View File

@ -43,3 +43,13 @@ DDEFS += -DHW_PROTEUS=1
ifeq ($(PROTEUS_LEGACY),TRUE)
DDEFS += -DUSE_ADC3_VBATT_HACK
endif
ifeq ($(PROJECT_CPU),ARCH_STM32F7)
DDEFS += -DSHORT_BOARD_NAME=proteus_f7
else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
DDEFS += -DSHORT_BOARD_NAME=proteus_f4
else ifeq ($(PROJECT_CPU),ARCH_STM32H7)
DDEFS += -DSHORT_BOARD_NAME=proteus_h7
else
$(error Unsupported PROJECT_CPU for Proteus: [$(PROJECT_CPU)])
endif

1
firmware/config/boards/proteus/compile_proteus_f4.sh
View File

@ -2,7 +2,6 @@
export PROJECT_BOARD=proteus
export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=proteus_f4
# export USE_OPENBLT=yes

2
firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh
View File

@ -2,7 +2,7 @@
export PROJECT_BOARD=proteus
export PROJECT_CPU=ARCH_STM32F4
export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE -DSHORT_BOARD_NAME=proteus_f4"
export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE"
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD

1
firmware/config/boards/proteus/compile_proteus_f7.sh
View File

@ -2,7 +2,6 @@
export PROJECT_BOARD=proteus
export PROJECT_CPU=ARCH_STM32F7
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=proteus_f7
# export USE_OPENBLT=yes

2
firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh
View File

@ -2,7 +2,7 @@
export PROJECT_BOARD=proteus
export PROJECT_CPU=ARCH_STM32F7
export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE -DSHORT_BOARD_NAME=proteus_f7"
export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_MODE=TRUE -DHW_CHECK_SD=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE"
export VAR_DEF_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD

1
firmware/config/boards/proteus/compile_proteus_h7.sh
View File

@ -2,6 +2,5 @@
export PROJECT_BOARD=proteus
export PROJECT_CPU=ARCH_STM32H7
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=proteus_h7
bash ../common_make.sh

1
firmware/config/boards/proteus/compile_proteus_legacy.sh
View File

@ -4,7 +4,6 @@
export PROJECT_BOARD=proteus
export PROJECT_CPU=ARCH_STM32F7
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=proteus_legacy
export PROTEUS_LEGACY=TRUE
bash ../common_make.sh

2
firmware/config/boards/subaru_eg33/board.mk
View File

@ -20,6 +20,8 @@ DDEFS += -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOG_7
DDEFS += -DHW_SUBARU_EG33=1
DDEFS += -DFIRMWARE_ID=\"EG33\"
DDEFS += -DSHORT_BOARD_NAME=subaru_eg33_f7
# Override DEFAULT_ENGINE_TYPE
DDEFS += -DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS

1
firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash
export PROJECT_BOARD=subaru_eg33
export PROJECT_CPU=ARCH_STM32F7
export EXTRA_PARAMS=-DSHORT_BOARD_NAME=subaru_eg33_f7
#-DDUMMY -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"

2
firmware/config/boards/subaru_eg33/make.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
export PROJECT_BOARD=subaru_eg33
export PROJECT_CPU=ARCH_STM32F7
export EXTRA_PARAMS="-DSHORT_BOARD_NAME=subaru_eg33_f7 -DDUMMY -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"
export EXTRA_PARAMS="-DDUMMY -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"
export VAR_DEF_ENGINE_TYPE="-DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS"
#echo $EXTRA_PARAMS
#export DEBUG_LEVEL_OPT="-O0"

2
firmware/config/boards/tdg-pdm8/board.mk
View File

@ -10,5 +10,5 @@ DDEFS += -DHW_TDG_PDM8=1
DDEFS += -DEFI_CAN_SERIAL=TRUE
DDEFS += -DFIRMWARE_ID=\"tdg-pdm8\"
DDEFS += -DFIRMWARE_ID=\"tdg-pdm8\" -DSHORT_BOARD_NAME=tdg-pdm8
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS