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

Simplify Makefile, unify board.mk files (#2229) 

* Proper way to add lis302 driver

* Proper way to add license directory to includes

* Makefile: simplify

All ChibiOS stuff is accumulated in ALLCSRC, ALLINC and so on.

* board.mk: append sources and includes to ALLSRC, ALLCPPSRC, ALLINC

* Cypress: fix CANv2 includence into build
This commit is contained in:
Andrey G 2021-01-17 17:32:06 +03:00 committed by GitHub
parent 6a1b9db952
commit baea67eccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 144 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
firmware/Makefile
View File

@ -153,6 +153,9 @@ ifeq ($(CONFDIR),)
CONFDIR = $(PROJECT_DIR)/config/stm32f4ems CONFDIR = $(PROJECT_DIR)/config/stm32f4ems
endif endif
# Include various ChibiOS mk files
# Licensing files.
include $(CHIBIOS)/os/license/license.mk
# Startup files. # Startup files.
include $(CPU_STARTUP_DIR) include $(CPU_STARTUP_DIR)
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
@ -162,12 +165,16 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional). # RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# EX files (optional).
include $(CHIBIOS)/os/ex/ST/lis302dl.mk
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
include $(CHIBIOS)/os/various/cpp_wrappers/chcpp.mk
ifeq ($(USE_FATFS),yes) ifeq ($(USE_FATFS),yes)
include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
endif endif
include $(CHIBIOS)/os/various/cpp_wrappers/chcpp.mk
#Now include RusEFI mk files
include console/binary/tunerstudio.mk include console/binary/tunerstudio.mk
ifeq ($(USE_FATFS),yes) ifeq ($(USE_FATFS),yes)
include $(PROJECT_DIR)/ext/fatfs.mk include $(PROJECT_DIR)/ext/fatfs.mk
@ -200,25 +207,17 @@ endif
# C sources that can be compiled in ARM or THUMB mode depending on the global # C sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CSRC = $(STARTUPSRC) \ CSRC = $(ALLCSRC) \
$(KERNSRC) \
$(PORTSRC) \
$(OSALSRC) \
$(HALSRC) \
$(HALSRC_CONTRIB) \
$(PLATFORMSRC) \
$(PLATFORMSRC_CONTRIB) \
$(BOARDSRC) \
$(BOOTLOADERSRC) \
$(CHIBIOS)/os/ex/ST/lis302dl.c \
$(CHIBIOS)/os/various/syscalls.c \ $(CHIBIOS)/os/various/syscalls.c \
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \ $(TRIGGER_SRC) \
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \ $(TRIGGER_DECODERS_SRC) \
$(DEV_SRC) \
$(BOOTLOADERSRC) \
${HW_MASS_STORAGE_SRC_C} \ ${HW_MASS_STORAGE_SRC_C} \
$(UTILSRC) \ $(UTILSRC) \
$(SYSTEMSRC) \
$(ENGINES_SRC) \ $(ENGINES_SRC) \
$(CONSOLESRC) \ $(CONSOLESRC) \
$(DEV_SRC) \
$(HW_LAYER_EMS) \ $(HW_LAYER_EMS) \
$(HW_LAYER_DRIVERS_CORE) \ $(HW_LAYER_DRIVERS_CORE) \
$(HW_LAYER_DRIVERS) \ $(HW_LAYER_DRIVERS) \
@ -226,28 +225,27 @@ CSRC = $(STARTUPSRC) \
$(CONTROLLERS_ALGO_SRC) \ $(CONTROLLERS_ALGO_SRC) \
$(CONTROLLERS_CORE_SRC) \ $(CONTROLLERS_CORE_SRC) \
$(CONTROLLERS_SENSORS_SRC) \ $(CONTROLLERS_SENSORS_SRC) \
$(FATFSSRC) \
$(SYSTEMSRC) \ $(SYSTEMSRC) \
main_hardfault.c main_hardfault.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global # C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CPPSRC = $(CHCPPSRC) \ CPPSRC = $(ALLCPPSRC) \
$(TRIGGER_SRC_CPP) \ $(TRIGGER_SRC_CPP) \
$(TRIGGER_DECODERS_SRC_CPP) \ $(TRIGGER_DECODERS_SRC_CPP) \
$(DEV_SRC_CPP) \ $(DEV_SRC_CPP) \
$(CONTROLLERS_ALGO_SRC_CPP) \ $(CONTROLLERS_ALGO_SRC_CPP) \
$(UTILSRC_CPP) \
$(SYSTEMSRC_CPP) \ $(SYSTEMSRC_CPP) \
$(BOARDSRC_CPP) \
$(ENGINES_SRC_CPP) \ $(ENGINES_SRC_CPP) \
$(HW_LAYER_EMS_CPP) \ $(HW_LAYER_EMS_CPP) \
$(HW_LAYER_DRIVERS_CORE_CPP) \
$(HW_LAYER_DRIVERS_CPP) \ $(HW_LAYER_DRIVERS_CPP) \
$(HW_SENSORS_SRC) \ $(HW_SENSORS_SRC) \
$(TUNERSTUDIO_SRC_CPP) \ $(TUNERSTUDIO_SRC_CPP) \
$(CONSOLE_SRC_CPP) \ $(CONSOLE_SRC_CPP) \
$(CONTROLLERS_SENSORS_SRC_CPP) \ $(CONTROLLERS_SENSORS_SRC_CPP) \
$(CONTROLLERS_SRC_CPP) \ $(CONTROLLERS_SRC_CPP) \
$(UTILSRC_CPP) \
$(CONTROLLERS_CORE_SRC_CPP) \ $(CONTROLLERS_CORE_SRC_CPP) \
$(CONTROLLERS_MATH_SRC_CPP) \ $(CONTROLLERS_MATH_SRC_CPP) \
$(INIT_SRC_CPP) \ $(INIT_SRC_CPP) \
@ -275,33 +273,15 @@ TCSRC =
TCPPSRC = TCPPSRC =
# List ASM source files here # List ASM source files here
# List ASM source files here ASMXSRC = $(ALLXASMSRC) \
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) \
$(RUSEFIASM) $(RUSEFIASM)
ifeq ($(CONFIGPATH),) INCDIR = $(ALLINC) \
CONFIGPATH=config/stm32f4ems
endif
INCDIR = $(CHIBIOS)/os/license \
$(PORTINC) \
$(OSALINC) \
$(KERNINC) \
$(TESTINC) \ $(TESTINC) \
$(STARTUPINC) \
$(HALINC) \
$(HALINC_CONTRIB) \
$(PLATFORMINC) \
$(PLATFORMINC_CONTRIB) \
$(BOARDINC) \
$(BOOTLOADERINC) \ $(BOOTLOADERINC) \
$(CHCPPINC) \
$(CHIBIOS)/os/hal/lib/streams \
$(CHIBIOS)/os/various \ $(CHIBIOS)/os/various \
$(CHIBIOS)/os/ex/ST \
$(CHIBIOS)/os/hal/lib/peripherals/sensors \ $(CHIBIOS)/os/hal/lib/peripherals/sensors \
$(CONFIGPATH) \ $(CONFDIR) \
config/engines \ config/engines \
config \ config \
ext \ ext \

6
firmware/config/boards/hellen/cypress/OS/os/hal/ports/Cypress/LLD/CANv2/driver.mk
View File

@ -1,9 +1,9 @@
ifeq ($(USE_SMART_BUILD),yes) ifeq ($(USE_SMART_BUILD),yes)
ifneq ($(findstring HAL_USE_CAN TRUE,$(HALCONF)),) ifneq ($(findstring HAL_USE_CAN TRUE,$(HALCONF)),)
PLATFORMSRC += ${CYPRESS_CONTRIB}/os/hal/ports/Cypress/LLD/CANv2/hal_can_lld.c PLATFORMSRC_CONTRIB += ${CYPRESS_CONTRIB}/os/hal/ports/Cypress/LLD/CANv2/hal_can_lld.c
endif endif
else else
PLATFORMSRC += ${CYPRESS_CONTRIB}/os/hal/ports/Cypress/LLD/CANv2/hal_can_lld.c PLATFORMSRC_CONTRIB += ${CYPRESS_CONTRIB}/os/hal/ports/Cypress/LLD/CANv2/hal_can_lld.c
endif endif
PLATFORMINC += ${CYPRESS_CONTRIB}/os/hal/ports/Cypress/LLD/CANv2 PLATFORMINC_CONTRIB += ${CYPRESS_CONTRIB}/os/hal/ports/Cypress/LLD/CANv2

8
firmware/config/boards/hellen/cypress/board.mk
View File

@ -9,7 +9,7 @@ PDL_DIR = $(CYPRESS_CONTRIB)/os/hal/ports/Cypress/PDL
BOARDSRC = $(BOARD_DIR)/board.c BOARDSRC = $(BOARD_DIR)/board.c
BOARDSRC_CPP = $(BOARD_DIR)/board_configuration.cpp BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Required include directories # Required include directories
BOARDINC = $(BOARD_DIR) BOARDINC = $(BOARD_DIR)
@ -17,7 +17,7 @@ BOARDINC += $(BOARD_DIR)/config/controllers/algo
BOARDINC += $(PDL_DIR)/driver $(PDL_DIR)/driver/gpio $(PDL_DIR)/driver/usb $(PDL_DIR)/driver/mfs $(PDL_DIR)/midware/usb/device BOARDINC += $(PDL_DIR)/driver $(PDL_DIR)/driver/gpio $(PDL_DIR)/driver/usb $(PDL_DIR)/driver/mfs $(PDL_DIR)/midware/usb/device
BOARDSRC_CPP += $(CONTROLLERS_ALGO_AUTO_GENERATED_ENUMS) BOARDCPPSRC += $(CONTROLLERS_ALGO_AUTO_GENERATED_ENUMS)
# Define linker script file here # Define linker script file here
LDSCRIPT= $(STARTUPLD)/cypress_S6E2CxAH.ld LDSCRIPT= $(STARTUPLD)/cypress_S6E2CxAH.ld
@ -25,3 +25,7 @@ LDSCRIPT= $(STARTUPLD)/cypress_S6E2CxAH.ld
#PLATFORMSRC += $(PLATFORMSRC_CONTRIB) #PLATFORMSRC += $(PLATFORMSRC_CONTRIB)
#PLATFORMINC += $(PLATFORMINC_CONTRIB) #PLATFORMINC += $(PLATFORMINC_CONTRIB)
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

21
firmware/config/boards/hellen/hellen72/board.mk
View File

@ -1,24 +1,24 @@
# Combine the related files for a specific platform and MCU. # Combine the related files for a specific platform and MCU.
# Target ECU board design # Target ECU board design
BOARDSRC_CPP = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp BOARDCPPSRC = $(BOARDS_DIR)/hellen/hellen72/board_configuration.cpp
BOARDINC = $(BOARDS_DIR)/hellen/hellen72 BOARDINC = $(BOARDS_DIR)/hellen/hellen72
# Target processor details # Target processor details
ifeq ($(PROJECT_CPU),ARCH_STM32F4) ifeq ($(PROJECT_CPU),ARCH_STM32F4)
MCU_DEFS = -DSTM32F427xx MCU_DEFS = -DSTM32F427xx
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h
BOARDINC += $(BOARDS_DIR)/st_stm32f4 BOARDINC += $(BOARDS_DIR)/st_stm32f4
LDSCRIPT = $(BOARDS_DIR)/prometheus/STM32F405xG.ld LDSCRIPT = $(BOARDS_DIR)/prometheus/STM32F405xG.ld
else else
# todo: add support for STM32H7 # todo: add support for STM32H7
MCU_DEFS = -DSTM32H743xx MCU_DEFS = -DSTM32H743xx
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c
CONFDIR = config/stm32h7ems CONFDIR = config/stm32h7ems
BOARDINC += $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI # For board.h BOARDINC += $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI # For board.h
BOARDINC += $(PROJECT_DIR)/config/stm32h7ems # efifeatures/halconf/chconf.h BOARDINC += $(PROJECT_DIR)/config/stm32h7ems # efifeatures/halconf/chconf.h
LDSCRIPT= $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld/STM32H743xI.ld LDSCRIPT = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld/STM32H743xI.ld
endif endif
# Set this if you want a default engine type other than normal Hellen72 # Set this if you want a default engine type other than normal Hellen72
@ -40,3 +40,8 @@ DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"hellen72\" $(DEFAULT_ENG
# We are running on Hellen-One hardware! # We are running on Hellen-One hardware!
DDEFS += -DHW_HELLEN=1 DDEFS += -DHW_HELLEN=1
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

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

@ -3,15 +3,20 @@
BOARD_DIR = $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD) BOARD_DIR = $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)
BOARDSRC = $(BOARD_DIR)/board.c BOARDSRC = $(BOARD_DIR)/board.c
BOARDSRC_CPP = $(BOARD_DIR)/board_configuration.cpp BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
# Required include directories # Required include directories
BOARDINC = $(BOARD_DIR) BOARDINC = $(BOARD_DIR)
BOARDINC += $(BOARD_DIR)/config/controllers/algo BOARDINC += $(BOARD_DIR)/config/controllers/algo
BOARDSRC_CPP += $(CONTROLLERS_ALGO_AUTO_GENERATED_ENUMS) BOARDCPPSRC += $(CONTROLLERS_ALGO_AUTO_GENERATED_ENUMS)
# Define linker script file here # Define linker script file here
LDSCRIPT= $(STARTUPLD)/MKE1xF512.ld LDSCRIPT = $(STARTUPLD)/MKE1xF512.ld
CONFDIR = $(BOARD_DIR) CONFDIR = $(BOARD_DIR)
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

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

@ -1,6 +1,6 @@
# List of all the board related files. # List of all the board related files.
BOARDSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board.c BOARDSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board.c
BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/me7_pnp/board_configuration.cpp BOARDCPPSRC = $(PROJECT_DIR)/config/boards/me7_pnp/board_configuration.cpp
# Required include directories # Required include directories
BOARDINC = $(PROJECT_DIR)/config/boards/NUCLEO_F767 $(PROJECT_DIR)/config/stm32f7ems BOARDINC = $(PROJECT_DIR)/config/boards/NUCLEO_F767 $(PROJECT_DIR)/config/stm32f7ems
@ -11,3 +11,8 @@ LDSCRIPT= $(PROJECT_DIR)/config/boards/nucleo_f767/STM32F76xxI.ld
# Override DEFAULT_ENGINE_TYPE # Override DEFAULT_ENGINE_TYPE
DDEFS += -DDEFAULT_ENGINE_TYPE=VAG_18_TURBO -DSTM32F767xx DDEFS += -DDEFAULT_ENGINE_TYPE=VAG_18_TURBO -DSTM32F767xx
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

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

@ -1,25 +1,25 @@
# Combine the related files for a specific platform and MCU. # Combine the related files for a specific platform and MCU.
# Target ECU board design # Target ECU board design
BOARDSRC_CPP = $(BOARDS_DIR)/microrusefi/board_configuration.cpp BOARDCPPSRC = $(BOARDS_DIR)/microrusefi/board_configuration.cpp
# Target processor details # Target processor details
ifeq ($(PROJECT_CPU),ARCH_STM32F4) ifeq ($(PROJECT_CPU),ARCH_STM32F4)
MCU_DEFS = -DSTM32F407xx MCU_DEFS = -DSTM32F407xx
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
BOARDINC = $(BOARDS_DIR)/microrusefi BOARDINC = $(BOARDS_DIR)/microrusefi
BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h
BOARDINC += $(BOARDS_DIR)/st_stm32f4 BOARDINC += $(BOARDS_DIR)/st_stm32f4
BOARDINC += $(BOARDS_DIR)/microrusefi # For knock_config.h BOARDINC += $(BOARDS_DIR)/microrusefi # For knock_config.h
LDSCRIPT= $(BOARDS_DIR)/prometheus/STM32F405xG.ld LDSCRIPT = $(BOARDS_DIR)/prometheus/STM32F405xG.ld
else else
MCU_DEFS = -DSTM32F767xx MCU_DEFS = -DSTM32F767xx
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
CONFDIR=config/stm32f7ems CONFDIR = config/stm32f7ems
BOARDINC = $(BOARDS_DIR)/nucleo_f767 # For board.h BOARDINC = $(BOARDS_DIR)/nucleo_f767 # For board.h
BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h
BOARDINC += $(BOARDS_DIR)/microrusefi # For knock_config.h BOARDINC += $(BOARDS_DIR)/microrusefi # For knock_config.h
LDSCRIPT= $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld LDSCRIPT = $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld
endif endif
# Set this if you want a default engine type other than normal MRE # Set this if you want a default engine type other than normal MRE
@ -42,3 +42,8 @@ DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"microRusEFI\" $(DEFAULT_
# We are running on microRusEFI hardware! # We are running on microRusEFI hardware!
DDEFS += -DHW_MICRO_RUSEFI=1 DDEFS += -DHW_MICRO_RUSEFI=1
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

11
firmware/config/boards/nucleo_f746/board.mk
View File

@ -1,12 +1,17 @@
# List of all the board related files. # List of all the board related files.
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F746ZG/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F746ZG/board.c
BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp BOARDCPPSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp
# Required include directories # Required include directories
BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_f746 $(PROJECT_DIR)/config/stm32f7ems BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_f746 $(PROJECT_DIR)/config/stm32f7ems
CONFDIR=config/stm32f7ems CONFDIR = config/stm32f7ems
LDSCRIPT= $(PROJECT_DIR)/config/boards/nucleo_f746/STM32F746xG.ld LDSCRIPT = $(PROJECT_DIR)/config/boards/nucleo_f746/STM32F746xG.ld
# Override DEFAULT_ENGINE_TYPE # Override DEFAULT_ENGINE_TYPE
DDEFS += -DDEFAULT_ENGINE_TYPE=DEFAULT_FRANKENSO -DSTM32F746xx DDEFS += -DDEFAULT_ENGINE_TYPE=DEFAULT_FRANKENSO -DSTM32F746xx
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

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

@ -1,12 +1,17 @@
# List of all the board related files. # List of all the board related files.
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp BOARDCPPSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp
# Required include directories # Required include directories
BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_f767 $(PROJECT_DIR)/config/stm32f7ems BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_f767 $(PROJECT_DIR)/config/stm32f7ems
CONFDIR=config/stm32f7ems CONFDIR = config/stm32f7ems
LDSCRIPT= $(PROJECT_DIR)/config/boards/nucleo_f767/STM32F76xxI.ld LDSCRIPT = $(PROJECT_DIR)/config/boards/nucleo_f767/STM32F76xxI.ld
# Override DEFAULT_ENGINE_TYPE # Override DEFAULT_ENGINE_TYPE
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS -DSTM32F767xx DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS -DSTM32F767xx
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

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

@ -5,5 +5,6 @@ BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c
BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI
# Shared variables # Shared variables
ALLCSRC += $(BOARDSRC) ALLCSRC += $(BOARDSRC)
ALLINC += $(BOARDINC) ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

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

@ -2,30 +2,35 @@
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F469I_DISCOVERY/board.c \ BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F469I_DISCOVERY/board.c \
$(PROJECT_DIR)/config/boards/prometheus/board_extra.c $(PROJECT_DIR)/config/boards/prometheus/board_extra.c
BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/Prometheus/board_configuration.cpp BOARDCPPSRC = $(PROJECT_DIR)/config/boards/Prometheus/board_configuration.cpp
# Required include directories # Required include directories
BOARDINC = $(PROJECT_DIR)/config/boards/prometheus BOARDINC = $(PROJECT_DIR)/config/boards/prometheus
# This board uses bootloader # This board uses bootloader
USE_BOOTLOADER=yes USE_BOOTLOADER = yes
# include Prometheus bootloader code # include Prometheus bootloader code
BOOTLOADERINC= $(PROJECT_DIR)/bootloader/prometheus/$(PROMETHEUS_BOARD) BOOTLOADERINC = $(PROJECT_DIR)/bootloader/prometheus/$(PROMETHEUS_BOARD)
# Default to a release build - clear EXTRA_PARAMS from cmdline to build debug # Default to a release build - clear EXTRA_PARAMS from cmdline to build debug
ifeq ($(EXTRA_PARAMS),) 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 = -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 endif
ifeq ($(DEBUG_LEVEL_OPT),) ifeq ($(DEBUG_LEVEL_OPT),)
DEBUG_LEVEL_OPT = -O2 DEBUG_LEVEL_OPT = -O2
endif endif
ifeq ($(PROMETHEUS_BOARD),405) ifeq ($(PROMETHEUS_BOARD),405)
LDSCRIPT= $(PROJECT_DIR)/config/boards/prometheus/STM32F405xG.ld LDSCRIPT = $(PROJECT_DIR)/config/boards/prometheus/STM32F405xG.ld
DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F405xx -DFIRMWARE_ID=\"prometeus405\" DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F405xx -DFIRMWARE_ID=\"prometeus405\"
else else
# Override DEFAULT_ENGINE_TYPE # Override DEFAULT_ENGINE_TYPE
LDSCRIPT= $(PROJECT_DIR)/config/boards/prometheus/STM32F469xI.ld LDSCRIPT = $(PROJECT_DIR)/config/boards/prometheus/STM32F469xI.ld
DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F469xx -DFIRMWARE_ID=\"prometeus469\" DDEFS += -DDEFAULT_ENGINE_TYPE=PROMETHEUS_DEFAULTS -DSTM32F469xx -DFIRMWARE_ID=\"prometeus469\"
endif endif
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

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

@ -1,24 +1,24 @@
# List of all the board related files. # List of all the board related files.
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
BOARDSRC_CPP = $(PROJECT_DIR)/config/boards/proteus/board_configuration.cpp \ BOARDCPPSRC = $(PROJECT_DIR)/config/boards/proteus/board_configuration.cpp \
$(PROJECT_DIR)/config/boards/proteus/adc_hack.cpp $(PROJECT_DIR)/config/boards/proteus/adc_hack.cpp
BOARDINC = $(PROJECT_DIR)/config/boards/proteus BOARDINC = $(PROJECT_DIR)/config/boards/proteus
# Target processor details # Target processor details
ifeq ($(PROJECT_CPU),ARCH_STM32F4) ifeq ($(PROJECT_CPU),ARCH_STM32F4)
MCU_DEFS = -DSTM32F407xx MCU_DEFS = -DSTM32F407xx
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h
BOARDINC += $(BOARDS_DIR)/st_stm32f4 BOARDINC += $(BOARDS_DIR)/st_stm32f4
LDSCRIPT= $(BOARDS_DIR)/prometheus/STM32F405xG.ld LDSCRIPT = $(BOARDS_DIR)/prometheus/STM32F405xG.ld
else else
MCU_DEFS = -DSTM32F767xx MCU_DEFS = -DSTM32F767xx
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
BOARDINC += $(BOARDS_DIR)/nucleo_f767 # For board.h BOARDINC += $(BOARDS_DIR)/nucleo_f767 # For board.h
BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h
LDSCRIPT= $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld LDSCRIPT = $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld
CONFDIR=config/stm32f4ems CONFDIR = config/stm32f4ems
PROTEUS_LEGACY=TRUE PROTEUS_LEGACY = TRUE
endif endif
# Override DEFAULT_ENGINE_TYPE # Override DEFAULT_ENGINE_TYPE
@ -40,3 +40,8 @@ DDEFS += -DHW_PROTEUS=1
ifeq ($(PROTEUS_LEGACY),TRUE) ifeq ($(PROTEUS_LEGACY),TRUE)
DDEFS += -DUSE_ADC3_VBATT_HACK DDEFS += -DUSE_ADC3_VBATT_HACK
endif endif
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

23
firmware/config/boards/skeleton/board.mk
View File

@ -1,22 +1,22 @@
# Combine the related files for a specific platform and MCU. # Combine the related files for a specific platform and MCU.
# Target ECU board design # Target ECU board design
BOARDSRC_CPP = $(BOARDS_DIR)/skeleton/board_configuration.cpp BOARDCPPSRC = $(BOARDS_DIR)/skeleton/board_configuration.cpp
# Target processor details # Target processor details
ifeq ($(PROJECT_CPU),ARCH_STM32F4) ifeq ($(PROJECT_CPU),ARCH_STM32F4)
MCU_DEFS = -DSTM32F407xx MCU_DEFS = -DSTM32F407xx
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
BOARDINC = $(BOARDS_DIR)/skeleton BOARDINC = $(BOARDS_DIR)/skeleton
BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h
BOARDINC += $(BOARDS_DIR)/st_stm32f4 BOARDINC += $(BOARDS_DIR)/st_stm32f4
LDSCRIPT= $(BOARDS_DIR)/prometheus/STM32F405xG.ld LDSCRIPT = $(BOARDS_DIR)/prometheus/STM32F405xG.ld
else else
MCU_DEFS = -DSTM32F767xx MCU_DEFS = -DSTM32F767xx
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
BOARDINC = $(BOARDS_DIR)/nucleo_f767 # For board.h BOARDINC = $(BOARDS_DIR)/nucleo_f767 # For board.h
BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h
LDSCRIPT= $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld LDSCRIPT = $(BOARDS_DIR)/nucleo_f767/STM32F76xxI.ld
endif endif
# Set this if you want a default engine type # Set this if you want a default engine type
@ -26,3 +26,8 @@ endif
# Add them all together # Add them all together
DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"skeleton\" $(DEFAULT_ENGINE_TYPE) DDEFS += $(MCU_DEFS) -DEFI_USE_OSC=TRUE -DLED_CRITICAL_ERROR_BRAIN_PIN=GPIOE_3 -DFIRMWARE_ID=\"skeleton\" $(DEFAULT_ENGINE_TYPE)
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

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

@ -1,7 +1,7 @@
# List of all the board related files. # List of all the board related files.
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c \ BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c \
$(PROJECT_DIR)/config/boards/st_stm32f4/board_extra.c $(PROJECT_DIR)/config/boards/st_stm32f4/board_extra.c
BOARDSRC_CPP = BOARDCPPSRC =
# Required include directories # Required include directories
BOARDINC = $(PROJECT_DIR)/config/boards/st_stm32f4 BOARDINC = $(PROJECT_DIR)/config/boards/st_stm32f4
@ -11,3 +11,8 @@ DDEFS += -DSTM32F407xx
# We are running on Frankenso hardware! # We are running on Frankenso hardware!
DDEFS += -DHW_FRANKENSO=1 DDEFS += -DHW_FRANKENSO=1
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLCPPSRC += $(BOARDCPPSRC)
ALLINC += $(BOARDINC)

3
firmware/controllers/trigger/trigger.mk
View File

@ -1,3 +1,4 @@
TRIGGER_DECODERS_SRC =
TRIGGER_DECODERS_SRC_CPP = \ TRIGGER_DECODERS_SRC_CPP = \
$(CONTROLLERS_DIR)/trigger/decoders/trigger_mazda.cpp \ $(CONTROLLERS_DIR)/trigger/decoders/trigger_mazda.cpp \
@ -17,6 +18,8 @@ TRIGGER_DECODERS_SRC_CPP = \
$(CONTROLLERS_DIR)/trigger/decoders/trigger_misc.cpp \ $(CONTROLLERS_DIR)/trigger/decoders/trigger_misc.cpp \
$(CONTROLLERS_DIR)/trigger/decoders/trigger_universal.cpp $(CONTROLLERS_DIR)/trigger/decoders/trigger_universal.cpp
TRIGGER_SRC =
TRIGGER_SRC_CPP = \ TRIGGER_SRC_CPP = \
$(CONTROLLERS_DIR)/trigger/trigger_emulator_algo.cpp \ $(CONTROLLERS_DIR)/trigger/trigger_emulator_algo.cpp \
$(CONTROLLERS_DIR)/trigger/trigger_central.cpp $(CONTROLLERS_DIR)/trigger/trigger_central.cpp

2
firmware/hw_layer/drivers/drivers.mk
View File

@ -9,6 +9,8 @@ HW_LAYER_DRIVERS_INC = \
HW_LAYER_DRIVERS_CORE = \ HW_LAYER_DRIVERS_CORE = \
$(DRIVERS_DIR)/gpio/core.c \ $(DRIVERS_DIR)/gpio/core.c \
HW_LAYER_DRIVERS_CORE_CPP =
HW_LAYER_DRIVERS = \ HW_LAYER_DRIVERS = \
$(DRIVERS_DIR)/gpio/tle6240.c \ $(DRIVERS_DIR)/gpio/tle6240.c \
$(DRIVERS_DIR)/gpio/tle8888.c \ $(DRIVERS_DIR)/gpio/tle8888.c \