From f83822383aeeb1ead0bf2c1347a6930dd9e61210 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 31 Jan 2022 23:17:13 -0500 Subject: [PATCH] merging two folders related to default binary --- .../config/boards/{st_stm32f4 => f407-discovery}/board.mk | 2 +- .../boards/{st_stm32f4 => f407-discovery}/board_extra.c | 0 firmware/config/boards/f407-discovery/readme.md | 2 ++ firmware/config/boards/st_stm32f4/readme.txt | 2 -- firmware/rusefi.mk | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename firmware/config/boards/{st_stm32f4 => f407-discovery}/board.mk (67%) rename firmware/config/boards/{st_stm32f4 => f407-discovery}/board_extra.c (100%) create mode 100644 firmware/config/boards/f407-discovery/readme.md delete mode 100644 firmware/config/boards/st_stm32f4/readme.txt diff --git a/firmware/config/boards/st_stm32f4/board.mk b/firmware/config/boards/f407-discovery/board.mk similarity index 67% rename from firmware/config/boards/st_stm32f4/board.mk rename to firmware/config/boards/f407-discovery/board.mk index eea3ab1fcf..ee8be0cf86 100644 --- a/firmware/config/boards/st_stm32f4/board.mk +++ b/firmware/config/boards/f407-discovery/board.mk @@ -1,5 +1,5 @@ # List of all the board related files. -BOARDSRC = $(PROJECT_DIR)/config/boards/st_stm32f4/board_extra.c +BOARDSRC = $(PROJECT_DIR)/config/boards/f407-discovery/board_extra.c # MCU defines DDEFS += -DSTM32F407xx diff --git a/firmware/config/boards/st_stm32f4/board_extra.c b/firmware/config/boards/f407-discovery/board_extra.c similarity index 100% rename from firmware/config/boards/st_stm32f4/board_extra.c rename to firmware/config/boards/f407-discovery/board_extra.c diff --git a/firmware/config/boards/f407-discovery/readme.md b/firmware/config/boards/f407-discovery/readme.md new file mode 100644 index 0000000000..b7a724a2fc --- /dev/null +++ b/firmware/config/boards/f407-discovery/readme.md @@ -0,0 +1,2 @@ + +This folder is used to generate 'all' version of .ini file and default binaries \ No newline at end of file diff --git a/firmware/config/boards/st_stm32f4/readme.txt b/firmware/config/boards/st_stm32f4/readme.txt deleted file mode 100644 index 9160aa325f..0000000000 --- a/firmware/config/boards/st_stm32f4/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -The files here are responsible for GPIO pin configuration on OS startup. rusEfi would later re-configure all the pins for specific -application so these files only matter for the first half a second of firmware startup. \ No newline at end of file diff --git a/firmware/rusefi.mk b/firmware/rusefi.mk index 9799bd7dae..6aa06704c0 100644 --- a/firmware/rusefi.mk +++ b/firmware/rusefi.mk @@ -16,7 +16,7 @@ $(error Please run 'make' again. Please make sure you have 'git' command in PATH endif ifeq ($(PROJECT_BOARD),) - PROJECT_BOARD = st_stm32f4 + PROJECT_BOARD = f407-discovery endif ifeq ($(PROJECT_CPU),) @@ -54,7 +54,7 @@ else ifeq ($(PROJECT_CPU),cypress) CPU_HWLAYER = ports/cypress else ifeq ($(PROJECT_CPU),simulator) else -$(error Unexpected PROJECT_CPU) +$(error Unexpected PROJECT_CPU [$(PROJECT_CPU)]) endif ifeq ($(CPU_STARTUP_DIR),)