From 3debd2229b3b87529888176643a00eb99dffd957 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Mon, 8 Feb 2021 12:46:48 -0800 Subject: [PATCH] move board.h for f7/h7 (#2316) * f7 board.h * h7 --- firmware/config/boards/me7_pnp/board.mk | 2 +- firmware/config/boards/microrusefi/board.mk | 1 - firmware/config/boards/nucleo_f767/board.mk | 2 +- firmware/config/boards/nucleo_h743/board.mk | 2 +- firmware/config/boards/proteus/board.mk | 1 - firmware/config/boards/skeleton/board.mk | 1 - .../boards/nucleo_f767 => hw_layer/ports/stm32/stm32f7}/board.h | 0 .../boards/nucleo_h743 => hw_layer/ports/stm32/stm32h7}/board.h | 0 8 files changed, 3 insertions(+), 6 deletions(-) rename firmware/{config/boards/nucleo_f767 => hw_layer/ports/stm32/stm32f7}/board.h (100%) rename firmware/{config/boards/nucleo_h743 => hw_layer/ports/stm32/stm32h7}/board.h (100%) diff --git a/firmware/config/boards/me7_pnp/board.mk b/firmware/config/boards/me7_pnp/board.mk index d95d633364..f7a0ae9808 100644 --- a/firmware/config/boards/me7_pnp/board.mk +++ b/firmware/config/boards/me7_pnp/board.mk @@ -2,7 +2,7 @@ BOARDCPPSRC = $(PROJECT_DIR)/config/boards/me7_pnp/board_configuration.cpp # Required include directories -BOARDINC = $(PROJECT_DIR)/config/boards/NUCLEO_F767 $(PROJECT_DIR)/config/stm32f7ems +BOARDINC = $(PROJECT_DIR)/config/stm32f7ems # Override DEFAULT_ENGINE_TYPE DDEFS += -DDEFAULT_ENGINE_TYPE=VAG_18_TURBO -DSTM32F767xx diff --git a/firmware/config/boards/microrusefi/board.mk b/firmware/config/boards/microrusefi/board.mk index 305c6d993f..c89f21a426 100644 --- a/firmware/config/boards/microrusefi/board.mk +++ b/firmware/config/boards/microrusefi/board.mk @@ -10,7 +10,6 @@ ifeq ($(PROJECT_CPU),ARCH_STM32F4) BOARDINC += $(BOARDS_DIR)/microrusefi # For knock_config.h else CONFDIR = config/stm32f7ems - BOARDINC = $(BOARDS_DIR)/nucleo_f767 # For board.h BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h BOARDINC += $(BOARDS_DIR)/microrusefi # For knock_config.h endif diff --git a/firmware/config/boards/nucleo_f767/board.mk b/firmware/config/boards/nucleo_f767/board.mk index 7c266b0626..5cd7884b5a 100644 --- a/firmware/config/boards/nucleo_f767/board.mk +++ b/firmware/config/boards/nucleo_f767/board.mk @@ -2,7 +2,7 @@ BOARDCPPSRC = $(PROJECT_DIR)/config/boards/nucleo_f767/board_configuration.cpp # Required include directories -BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_f767 $(PROJECT_DIR)/config/stm32f7ems +BOARDINC = $(PROJECT_DIR)/config/stm32f7ems CONFDIR = config/stm32f7ems # Override DEFAULT_ENGINE_TYPE diff --git a/firmware/config/boards/nucleo_h743/board.mk b/firmware/config/boards/nucleo_h743/board.mk index e9c60b01e7..f48daae7a2 100644 --- a/firmware/config/boards/nucleo_h743/board.mk +++ b/firmware/config/boards/nucleo_h743/board.mk @@ -1,7 +1,7 @@ # List of all the board related files. # Required include directories -BOARDINC = $(PROJECT_DIR)/config/boards/nucleo_h743 $(PROJECT_DIR)/config/stm32h7ems +BOARDINC = $(PROJECT_DIR)/config/stm32h7ems CONFDIR = config/stm32h7ems LDSCRIPT = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/ld/STM32H743xI.ld diff --git a/firmware/config/boards/proteus/board.mk b/firmware/config/boards/proteus/board.mk index 74c6d8daaa..63610fd51d 100644 --- a/firmware/config/boards/proteus/board.mk +++ b/firmware/config/boards/proteus/board.mk @@ -7,7 +7,6 @@ BOARDINC = $(PROJECT_DIR)/config/boards/proteus ifeq ($(PROJECT_CPU),ARCH_STM32F4) BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h else - BOARDINC += $(BOARDS_DIR)/nucleo_f767 # For board.h BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h CONFDIR = config/stm32f4ems PROTEUS_LEGACY = TRUE diff --git a/firmware/config/boards/skeleton/board.mk b/firmware/config/boards/skeleton/board.mk index 1beecf621e..238e89d2aa 100644 --- a/firmware/config/boards/skeleton/board.mk +++ b/firmware/config/boards/skeleton/board.mk @@ -8,7 +8,6 @@ ifeq ($(PROJECT_CPU),ARCH_STM32F4) BOARDINC = $(BOARDS_DIR)/skeleton BOARDINC += $(PROJECT_DIR)/config/stm32f4ems # For board.h else - BOARDINC = $(BOARDS_DIR)/nucleo_f767 # For board.h BOARDINC += $(PROJECT_DIR)/config/stm32f7ems # efifeatures/halconf/chconf.h endif diff --git a/firmware/config/boards/nucleo_f767/board.h b/firmware/hw_layer/ports/stm32/stm32f7/board.h similarity index 100% rename from firmware/config/boards/nucleo_f767/board.h rename to firmware/hw_layer/ports/stm32/stm32f7/board.h diff --git a/firmware/config/boards/nucleo_h743/board.h b/firmware/hw_layer/ports/stm32/stm32h7/board.h similarity index 100% rename from firmware/config/boards/nucleo_h743/board.h rename to firmware/hw_layer/ports/stm32/stm32h7/board.h