From faf1f7a9667755a497c0e921bad6b8104507a64d Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 22 Mar 2017 16:47:13 -0400 Subject: [PATCH] progress #380 --- firmware/Makefile | 4 ++-- .../ST_STM32F4_DISCOVERY => config/boards/ST_STM32F4}/board.c | 0 .../ST_STM32F4_DISCOVERY => config/boards/ST_STM32F4}/board.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename firmware/{chibios/boards/ST_STM32F4_DISCOVERY => config/boards/ST_STM32F4}/board.c (100%) rename firmware/{chibios/boards/ST_STM32F4_DISCOVERY => config/boards/ST_STM32F4}/board.h (100%) diff --git a/firmware/Makefile b/firmware/Makefile index 3577d432ac..43bb59c408 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -83,13 +83,12 @@ CHIBIOS = chibios #PROJECT_BOARD = OLIMEX_STM32_E407 ifneq ($(PROJECT_BOARD),OLIMEX_STM32_E407) - PROJECT_BOARD = ST_STM32F4_DISCOVERY + PROJECT_BOARD = ST_STM32F4 endif DDEFS += -D$(PROJECT_BOARD) # Imported source files and paths -include $(CHIBIOS)/boards/$(PROJECT_BOARD)/board.mk include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F4xx/port.mk @@ -106,6 +105,7 @@ include development/development.mk include controllers/controllers.mk include $(PROJECT_DIR)/util/util.mk +include $(PROJECT_DIR)/config/boards/$(PROJECT_BOARD)/board.mk include $(PROJECT_DIR)/config/engines/engines.mk include $(PROJECT_DIR)/controllers/algo/algo.mk include $(PROJECT_DIR)/controllers/core/core.mk diff --git a/firmware/chibios/boards/ST_STM32F4_DISCOVERY/board.c b/firmware/config/boards/ST_STM32F4/board.c similarity index 100% rename from firmware/chibios/boards/ST_STM32F4_DISCOVERY/board.c rename to firmware/config/boards/ST_STM32F4/board.c diff --git a/firmware/chibios/boards/ST_STM32F4_DISCOVERY/board.h b/firmware/config/boards/ST_STM32F4/board.h similarity index 100% rename from firmware/chibios/boards/ST_STM32F4_DISCOVERY/board.h rename to firmware/config/boards/ST_STM32F4/board.h