mirror of https://github.com/rusefi/rusefi-1.git
include board.c from hw_ports.mk (#2311)
* set mcu type in hw_ports * move f4 linker script * move f7 linker script * don't set default linker file in makefiles * extra line * prometheus actually didn't depend on anything special for f469 * dead line * h7 * dead * move board.c * set explicit cpu type for simulator Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
parent
06cc20f614
commit
b995e7bcaa
|
@ -6,12 +6,10 @@ BOARDINC = $(BOARDS_DIR)/hellen/hellen72
|
|||
|
||||
# Target processor details
|
||||
ifeq ($(PROJECT_CPU),ARCH_STM32F4)
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
|
||||
BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h
|
||||
BOARDINC += $(BOARDS_DIR)/st_stm32f4
|
||||
else
|
||||
# todo: add support for STM32H7
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c
|
||||
CONFDIR = config/stm32h7ems
|
||||
BOARDINC += $(PROJECT_DIR)/config/boards/nucleo_h743 # For board.h
|
||||
BOARDINC += $(PROJECT_DIR)/config/stm32h7ems # efifeatures/halconf/chconf.h
|
||||
|
@ -41,6 +39,5 @@ DDEFS += -DEFI_LOGIC_ANALYZER=FALSE
|
|||
DDEFS += -DHW_HELLEN=1
|
||||
|
||||
# Shared variables
|
||||
ALLCSRC += $(BOARDSRC)
|
||||
ALLCPPSRC += $(BOARDCPPSRC)
|
||||
ALLINC += $(BOARDINC)
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
# List of all the board related files.
|
||||
BOARDSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board.c
|
||||
BOARDCPPSRC = $(PROJECT_DIR)/config/boards/me7_pnp/board_configuration.cpp
|
||||
|
||||
# Required include directories
|
||||
|
@ -9,6 +8,5 @@ BOARDINC = $(PROJECT_DIR)/config/boards/NUCLEO_F767 $(PROJECT_DIR)/config/stm32f
|
|||
DDEFS += -DDEFAULT_ENGINE_TYPE=VAG_18_TURBO -DSTM32F767xx
|
||||
|
||||
# Shared variables
|
||||
ALLCSRC += $(BOARDSRC)
|
||||
ALLCPPSRC += $(BOARDCPPSRC)
|
||||
ALLINC += $(BOARDINC)
|
||||
|
|
|
@ -5,13 +5,11 @@ BOARDCPPSRC = $(BOARDS_DIR)/microrusefi/board_configuration.cpp
|
|||
|
||||
# Target processor details
|
||||
ifeq ($(PROJECT_CPU),ARCH_STM32F4)
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
|
||||
BOARDINC = $(BOARDS_DIR)/microrusefi
|
||||
BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h
|
||||
BOARDINC += $(BOARDS_DIR)/st_stm32f4
|
||||
BOARDINC += $(BOARDS_DIR)/microrusefi # For knock_config.h
|
||||
else
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
|
||||
CONFDIR = config/stm32f7ems
|
||||
BOARDINC = $(BOARDS_DIR)/nucleo_f767 # For board.h
|
||||
BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h
|
||||
|
@ -40,6 +38,5 @@ DDEFS += -DEFI_USE_OSC=TRUE -DFIRMWARE_ID=\"microRusEFI\" $(DEFAULT_ENGINE_TYPE)
|
|||
DDEFS += -DHW_MICRO_RUSEFI=1
|
||||
|
||||
# Shared variables
|
||||
ALLCSRC += $(BOARDSRC)
|
||||
ALLCPPSRC += $(BOARDCPPSRC)
|
||||
ALLINC += $(BOARDINC)
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
# List of all the board related files.
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
|
||||
BOARDCPPSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp
|
||||
|
||||
# Required include directories
|
||||
|
@ -10,6 +9,5 @@ CONFDIR = config/stm32f7ems
|
|||
DDEFS += -DDEFAULT_ENGINE_TYPE=MINIMAL_PINS -DSTM32F767xx
|
||||
|
||||
# Shared variables
|
||||
ALLCSRC += $(BOARDSRC)
|
||||
ALLCPPSRC += $(BOARDCPPSRC)
|
||||
ALLINC += $(BOARDINC)
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
# List of all the board related files.
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c
|
||||
|
||||
# Required include directories
|
||||
BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_h743 $(PROJECT_DIR)/config/stm32h7ems
|
||||
|
@ -8,6 +7,5 @@ CONFDIR = config/stm32h7ems
|
|||
LDSCRIPT = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld/STM32H743xI.ld
|
||||
|
||||
# Shared variables
|
||||
ALLCSRC += $(BOARDSRC)
|
||||
ALLCPPSRC += $(BOARDCPPSRC)
|
||||
ALLINC += $(BOARDINC)
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
# List of all the board related files.
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c \
|
||||
$(PROJECT_DIR)/config/boards/prometheus/board_extra.c
|
||||
BOARDSRC = $(PROJECT_DIR)/config/boards/prometheus/board_extra.c
|
||||
|
||||
BOARDCPPSRC = $(PROJECT_DIR)/config/boards/Prometheus/board_configuration.cpp
|
||||
|
||||
|
|
|
@ -5,11 +5,9 @@ BOARDINC = $(PROJECT_DIR)/config/boards/proteus
|
|||
|
||||
# Target processor details
|
||||
ifeq ($(PROJECT_CPU),ARCH_STM32F4)
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
|
||||
BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h
|
||||
BOARDINC += $(BOARDS_DIR)/st_stm32f4
|
||||
else
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
|
||||
BOARDINC += $(BOARDS_DIR)/nucleo_f767 # For board.h
|
||||
BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h
|
||||
CONFDIR = config/stm32f4ems
|
||||
|
@ -37,6 +35,5 @@ ifeq ($(PROTEUS_LEGACY),TRUE)
|
|||
endif
|
||||
|
||||
# Shared variables
|
||||
ALLCSRC += $(BOARDSRC)
|
||||
ALLCPPSRC += $(BOARDCPPSRC)
|
||||
ALLINC += $(BOARDINC)
|
||||
|
|
|
@ -5,12 +5,10 @@ BOARDCPPSRC = $(BOARDS_DIR)/skeleton/board_configuration.cpp
|
|||
|
||||
# Target processor details
|
||||
ifeq ($(PROJECT_CPU),ARCH_STM32F4)
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
|
||||
BOARDINC = $(BOARDS_DIR)/skeleton
|
||||
BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h
|
||||
BOARDINC += $(BOARDS_DIR)/st_stm32f4
|
||||
else
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
|
||||
BOARDINC = $(BOARDS_DIR)/nucleo_f767 # For board.h
|
||||
BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h
|
||||
endif
|
||||
|
@ -24,6 +22,5 @@ endif
|
|||
DDEFS += -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)
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
# List of all the board related files.
|
||||
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c \
|
||||
$(PROJECT_DIR)/config/boards/st_stm32f4/board_extra.c
|
||||
BOARDSRC = $(PROJECT_DIR)/config/boards/st_stm32f4/board_extra.c
|
||||
BOARDCPPSRC =
|
||||
|
||||
# Required include directories
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
BOARD_DIR = $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)
|
||||
|
||||
# List of all the board related files.
|
||||
BOARDSRC = $(BOARD_DIR)/board.c
|
||||
BOARDCPPSRC = $(BOARD_DIR)/board_configuration.cpp
|
||||
|
||||
# Required include directories
|
||||
|
@ -30,6 +29,5 @@ DDEFS += -DHW_SUBARU_EG33=1
|
|||
DDEFS += -DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS -DSTM32F765xx $(LED_CRITICAL_ERROR_BRAIN_PIN)
|
||||
|
||||
# Shared variables
|
||||
ALLCSRC += $(BOARDSRC)
|
||||
ALLCPPSRC += $(BOARDCPPSRC)
|
||||
ALLINC += $(BOARDINC)
|
||||
|
|
|
@ -7,3 +7,4 @@ HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/mpu_util.cpp
|
|||
|
||||
DDEFS += -DSTM32F407xx
|
||||
LDSCRIPT = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f4/STM32F405xG.ld
|
||||
ALLCSRC += $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.c
|
||||
|
|
|
@ -7,3 +7,4 @@ HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/mpu_util.cpp
|
|||
|
||||
DDEFS += -DSTM32F767xx
|
||||
LDSCRIPT = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32f7/STM32F76xxI.ld
|
||||
ALLCSRC += $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_F767ZI/board.c
|
||||
|
|
|
@ -7,3 +7,4 @@ HW_LAYER_EMS_CPP += $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/mpu_util.cpp
|
|||
|
||||
DDEFS += -DSTM32H743xx
|
||||
LDSCRIPT = $(PROJECT_DIR)/hw_layer/ports/stm32/stm32h7/STM32H743xI.ld
|
||||
ALLCSRC += $(CHIBIOS)/os/hal/boards/ST_NUCLEO144_H743ZI/board.c
|
||||
|
|
|
@ -32,6 +32,7 @@ CPU_PLATFORM = STM32H7xx/platform.mk
|
|||
CPU_HWLAYER = ports/stm32/stm32h7
|
||||
else ifeq ($(PROJECT_CPU),kinetis)
|
||||
else ifeq ($(PROJECT_CPU),cypress)
|
||||
else ifeq ($(PROJECT_CPU),simulator)
|
||||
else
|
||||
$(error Unexpected PROJECT_CPU)
|
||||
endif
|
||||
|
|
|
@ -17,6 +17,8 @@ CHIBIOS = ../firmware/ChibiOS
|
|||
RULESPATH = $(CHIBIOS)/os/common/startup/SIMIA32/compilers/GCC
|
||||
RULESFILE = $(RULESPATH)/rules.mk
|
||||
|
||||
PROJECT_CPU=simulator
|
||||
|
||||
include ../firmware/rusefi.mk
|
||||
RULESFILE = ../firmware/rusefi_rules.mk
|
||||
|
||||
|
|
Loading…
Reference in New Issue