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

move SHORT_BOARD_NAME in to a makefile variable

This commit is contained in:
rusefillc 2023-11-08 09:48:54 -05:00 committed by rusefillc
parent 319468affb
commit 5d7ece6bc0
28 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/Makefile
View File

@ -164,6 +164,10 @@ MAKEFLAGS += ${NUMJOBS}
BOARDINC = $(BOARD_DIR)
include $(BOARD_DIR)/board.mk
BOARDCPPSRC += $(BOARDS_DIR)/board_id.cpp
ifeq ($(SHORT_BOARD_NAME),)
$(error SHORT_BOARD_NAME not set, something wrong with your board.mk file)
endif
DDEFS += -DSHORT_BOARD_NAME=$(SHORT_BOARD_NAME)
# Include various ChibiOS mk files
# Licensing files.
@ -221,6 +225,7 @@ endif
$(info PROJECT_BOARD: $(PROJECT_BOARD))
$(info BOARD_DIR: $(BOARD_DIR))
$(info PROJECT_CPU: $(PROJECT_CPU))
$(info SHORT_BOARD_NAME: $(SHORT_BOARD_NAME))
$(info CPU_HWLAYER: $(CPU_HWLAYER))
$(info CONFDIR: $(CONFDIR))
$(info LDSCRIPT: $(LDSCRIPT))

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

@ -29,6 +29,6 @@ DDEFS += -DFIRMWARE_ID=\"at_start_f435\"
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_AT_START_F435
DDEFS += -DSHORT_BOARD_NAME=at_start_f435
SHORT_BOARD_NAME=at_start_f435
DDEFS += -DEFI_BACKUP_SRAM=FALSE

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

@ -2,6 +2,6 @@
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_CORE8
DDEFS += -DSHORT_BOARD_NAME=core8
SHORT_BOARD_NAME=core8
DDEFS += -DFIRMWARE_ID=\"core8\"
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS

2
firmware/config/boards/cypress/config.mk
View File

@ -11,7 +11,7 @@ GENERATED_ENUMS_DIR = $(BOARD_DIR)/config/controllers/algo
EXTRA_PARAMS += -DFIRMWARE_ID=\"cypress\"
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_CYPRESS
DDEFS += -DSHORT_BOARD_NAME=cypress
SHORT_BOARD_NAME=cypress
# used by USE_SMART_BUILD
CONFDIR = $(BOARD_DIR)

2
firmware/config/boards/f429-208/board.mk
View File

@ -19,7 +19,7 @@ DDEFS += -DHAL_USE_FSMC=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HABA208
# see signature_haba208.h
DDEFS += -DSHORT_BOARD_NAME=haba208
SHORT_BOARD_NAME=haba208
# Shared variables
ALLINC += $(BOARDINC)

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

@ -1,3 +1,3 @@
DDEFS += -DSHORT_BOARD_NAME=frankenso_na6
SHORT_BOARD_NAME=frankenso_na6
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_FRANKENSO_NA6

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

@ -20,5 +20,5 @@ DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_2CHAN
DDEFS += -DSHORT_BOARD_NAME=alphax-2chan
SHORT_BOARD_NAME=alphax-2chan

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

@ -23,7 +23,7 @@ DDEFS += -DTRIGGER_SCOPE
ifeq ($(PROJECT_CPU),ARCH_STM32F7)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN_F7
DDEFS += -DSHORT_BOARD_NAME=alphax-4chan_f7
SHORT_BOARD_NAME=alphax-4chan_f7
# TODO: why do I struggle to fit into flash? compare with Proteus
#Linker options, flash size
USE_OPT += -Wl,--defsym=FLASH_SIZE=768k
@ -32,7 +32,7 @@ ifeq ($(PROJECT_CPU),ARCH_STM32F7)
DDEFS += -DTS_PRIMARY_UxART_PORT=SD2 -DEFI_TS_PRIMARY_IS_SERIAL=TRUE -DSTM32_SERIAL_USE_USART2=TRUE -DSTM32_UART_USE_USART2=FALSE
else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_4CHAN
DDEFS += -DSHORT_BOARD_NAME=alphax-4chan
SHORT_BOARD_NAME=alphax-4chan
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
else
$(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])

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

@ -30,5 +30,5 @@ endif
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
DDEFS += -DSHORT_BOARD_NAME=alphax-8chan
SHORT_BOARD_NAME=alphax-8chan
DDEFS += -DHW_HELLEN_8CHAN=1

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

@ -31,5 +31,5 @@ $(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
endif
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_ALPHAX_8CHAN
DDEFS += -DSHORT_BOARD_NAME=alphax-8chan
SHORT_BOARD_NAME=alphax-8chan
DDEFS += -DHW_HELLEN_8CHAN=1

2
firmware/config/boards/hellen/hellen-112-17/board.mk
View File

@ -15,7 +15,7 @@ DDEFS += -DEFI_MAIN_RELAY_CONTROL=TRUE
DDEFS += -DFIRMWARE_ID=\"hellen-112-17\" $(VAR_DEF_ENGINE_TYPE)
#DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DSHORT_BOARD_NAME=hellen-112-17
SHORT_BOARD_NAME=hellen-112-17
DDEFS += -DHW_HELLEN_K=TRUE
DDEFS += -DHELLEN_BOARD_ID_DEBUG

2
firmware/config/boards/hellen/hellen-gm-e67/board.mk
View File

@ -13,5 +13,5 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_GM_E67
DDEFS += -DSHORT_BOARD_NAME=hellen-gm-e67
SHORT_BOARD_NAME=hellen-gm-e67

2
firmware/config/boards/hellen/hellen-honda-k/board.mk
View File

@ -19,7 +19,7 @@ DDEFS += -DFIRMWARE_ID=\"hellen-honda-k\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_HONDA_K
DDEFS += -DSHORT_BOARD_NAME=hellen-honda-k
SHORT_BOARD_NAME=hellen-honda-k
DDEFS += -DHW_HELLEN_K=TRUE
include $(BOARDS_DIR)/hellen/hellen-common144.mk

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

@ -18,6 +18,6 @@ include $(BOARDS_DIR)/hellen/hellen-common144.mk
# Enable serial pins on expansion header
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NB1
DDEFS += -DSHORT_BOARD_NAME=hellen-nb1
SHORT_BOARD_NAME=hellen-nb1
DDEFS += -DHW_HELLEN_NB1=1

2
firmware/config/boards/hellen/hellen121vag/board.mk
View File

@ -20,7 +20,7 @@ endif
DDEFS += -DEFI_LUA_LOOKUP=$(EFI_LUA_LOOKUP)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_121VAG
DDEFS += -DSHORT_BOARD_NAME=hellen121vag
SHORT_BOARD_NAME=hellen121vag
include $(BOARDS_DIR)/hellen/hellen-common176.mk

2
firmware/config/boards/hellen/hellenNA8_96/board.mk
View File

@ -14,7 +14,7 @@ DDEFS += -DFIRMWARE_ID=\"hellenNB1\" $(VAR_DEF_ENGINE_TYPE)
DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE
include $(BOARDS_DIR)/hellen/hellen-common144.mk
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_HELLEN_NA8_96
DDEFS += -DSHORT_BOARD_NAME=hellenNA8_96
SHORT_BOARD_NAME=hellenNA8_96
# Enable serial pins on expansion header
DDEFS += $(PRIMARY_COMMUNICATION_PORT_USART2)

2
firmware/config/boards/hellen/small-can-board/board.mk
View File

@ -3,7 +3,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
DDEFS += -DFIRMWARE_ID=\"small-can-board\"
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_SMALL_CAN_BOARD
DDEFS += -DSHORT_BOARD_NAME=small-can-board
SHORT_BOARD_NAME=small-can-board
#DDEFS += -DEFI_SENT_SUPPORT=TRUE

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

@ -15,7 +15,7 @@ LDSCRIPT = $(STARTUPLD_KINETIS)/MKE1xF512.ld
CONFDIR = $(BOARD_DIR)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_KIN
DDEFS += -DSHORT_BOARD_NAME=kin
SHORT_BOARD_NAME=kin
DDEFS += -DCPU_MKE16F512VLH16
DDEFS += -DCPU_MKE16F512VLH16_cm4
DDEFS += -D__USE_CMSIS

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

@ -13,5 +13,5 @@ DDEFS += -DFIRMWARE_ID=\"m74_9\"
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_M74_9
DDEFS += -DSHORT_BOARD_NAME=m74_9
SHORT_BOARD_NAME=m74_9

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

@ -47,10 +47,10 @@ DDEFS += -DHW_MICRO_RUSEFI=1
ifeq ($(PROJECT_CPU),ARCH_STM32F7)
USE_OPT += -Wl,--defsym=FLASH_SIZE=768k
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F7
DDEFS += -DSHORT_BOARD_NAME=mre_f7
SHORT_BOARD_NAME=mre_f7
else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_MRE_F4
DDEFS += -DSHORT_BOARD_NAME=mre_f4
SHORT_BOARD_NAME=mre_f4
else
$(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
endif

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

@ -13,4 +13,4 @@ IS_STM32F429 = yes
DDEFS += -DFIRMWARE_ID=\"nucleo_f429\"
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F429
DDEFS += -DSHORT_BOARD_NAME=nucleo_f429
SHORT_BOARD_NAME=nucleo_f429

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

@ -17,4 +17,4 @@ DDEFS += -DEFI_ETHERNET=TRUE
DDEFS += -DFIRMWARE_ID=\"nucleo_f767\"
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_F767
DDEFS += -DSHORT_BOARD_NAME=nucleo_f767
SHORT_BOARD_NAME=nucleo_f767

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

@ -12,4 +12,4 @@ DDEFS += -DEFI_ETHERNET=TRUE
DDEFS += -DFIRMWARE_ID=\"nucleo_h743\"
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_NUCLEO_H743
DDEFS += -DSHORT_BOARD_NAME=nucleo_h743
SHORT_BOARD_NAME=nucleo_h743

4
firmware/config/boards/prometheus/prometheus-common-board.mk
View File

@ -17,9 +17,9 @@ endif
ifeq ($(PROMETHEUS_BOARD),405)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROMETHEUS_405
DDEFS += -DFIRMWARE_ID=\"prometeus405\"
DDEFS += -DSHORT_BOARD_NAME=prometheus_405
SHORT_BOARD_NAME=prometheus_405
else
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROMETHEUS_469
DDEFS += -DFIRMWARE_ID=\"prometeus469\"
DDEFS += -DSHORT_BOARD_NAME=prometheus_469
SHORT_BOARD_NAME=prometheus_469
endif

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

@ -38,16 +38,16 @@ DDEFS += -DHW_PROTEUS=1
ifeq ($(PROJECT_CPU),ARCH_STM32F7)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_F7
DDEFS += -DSHORT_BOARD_NAME=proteus_f7
SHORT_BOARD_NAME=proteus_f7
ifeq ($(DEBUG_LEVEL_OPT),)
DEBUG_LEVEL_OPT = -Os -ggdb -g
endif
else ifeq ($(PROJECT_CPU),ARCH_STM32F4)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_F4
DDEFS += -DSHORT_BOARD_NAME=proteus_f4
SHORT_BOARD_NAME=proteus_f4
else ifeq ($(PROJECT_CPU),ARCH_STM32H7)
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_PROTEUS_H7
DDEFS += -DSHORT_BOARD_NAME=proteus_h7
SHORT_BOARD_NAME=proteus_h7
else
$(error Unsupported PROJECT_CPU [$(PROJECT_CPU)])
endif

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

@ -5,7 +5,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# This is S105 board
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_S105
DDEFS += -DSHORT_BOARD_NAME=s105
SHORT_BOARD_NAME=s105
# This board has no LSE and HSE oscillators
DDEFS += -DSTM32_HSE_ENABLED=FALSE

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

@ -11,5 +11,5 @@ DDEFS += -DHW_TDG_PDM8=1
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TDG_PDM8
DDEFS += -DFIRMWARE_ID=\"tdg-pdm8\"
DDEFS += -DSHORT_BOARD_NAME=tdg-pdm8
SHORT_BOARD_NAME=tdg-pdm8
DDEFS += -DDEFAULT_ENGINE_TYPE=engine_type_e::MINIMAL_PINS

2
firmware/config/boards/test-build-guards/board.mk
View File

@ -2,7 +2,7 @@ BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
DDEFS += -DFIRMWARE_ID=\"t-b-g\"
DDEFS += -DSTATIC_BOARD_ID=STATIC_BOARD_ID_TBG
DDEFS += -DSHORT_BOARD_NAME=t-b-g
SHORT_BOARD_NAME=t-b-g
DDEFS += -DHAL_USE_ADC=FALSE
DDEFS += -DHAL_USE_GPT=FALSE