From b729d85e8337224ea69a9051af9776bb0a5f1beb Mon Sep 17 00:00:00 2001 From: rusEFI LLC Date: Sun, 28 Apr 2024 10:27:38 -0400 Subject: [PATCH] calibrations_on_flash.mk --- firmware/config/boards/at_start_f435/board.mk | 3 ++- firmware/config/boards/m74_9/board.mk | 3 ++- firmware/config/boards/subaru_eg33/board.mk | 12 +++++++++++- firmware/config/boards/subaru_eg33/efifeatures.h | 9 --------- firmware/config/boards/subaru_eg33/halconf.h | 6 ------ .../hw_layer/ports/stm32/calibrations_on_flash.mk | 3 +++ 6 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 firmware/hw_layer/ports/stm32/calibrations_on_flash.mk diff --git a/firmware/config/boards/at_start_f435/board.mk b/firmware/config/boards/at_start_f435/board.mk index 488f2e1410..7c29a54071 100644 --- a/firmware/config/boards/at_start_f435/board.mk +++ b/firmware/config/boards/at_start_f435/board.mk @@ -21,7 +21,8 @@ BOARDINC = $(CHIBIOS)/os/hal/boards/AT_START_F435/ CONFDIR = $(PROJECT_DIR)/hw_layer/ports/at32/at32f4/cfg # This board uses ChibiOS MFS driver on internal flash -DDEFS += -DEFI_STORAGE_INT_FLASH=FLASE -DHAL_USE_EFL=TRUE -DEFI_STORAGE_MFS=TRUE +DDEFS += -DHAL_USE_EFL=TRUE +include $(PROJECT_DIR)/hw_layer/ports/stm32/calibrations_on_flash.mk # This board has chip with dual-bank flash, bank 2 can be flashed in background DDEFS += -DEFI_FLASH_WRITE_THREAD=TRUE diff --git a/firmware/config/boards/m74_9/board.mk b/firmware/config/boards/m74_9/board.mk index c45b795f0f..f5fa3cb631 100644 --- a/firmware/config/boards/m74_9/board.mk +++ b/firmware/config/boards/m74_9/board.mk @@ -25,7 +25,8 @@ USE_FATFS = no CONFDIR = $(PROJECT_DIR)/hw_layer/ports/at32/at32f4/cfg # This board uses ChibiOS MFS driver on internal flash -DDEFS += -DEFI_STORAGE_INT_FLASH=FLASE -DHAL_USE_EFL=TRUE -DEFI_STORAGE_MFS=TRUE +DDEFS += -DHAL_USE_EFL=TRUE +include $(PROJECT_DIR)/hw_layer/ports/stm32/calibrations_on_flash.mk # This board has chip with dual-bank flash, bank 2 can be flashed in background DDEFS += -DEFI_FLASH_WRITE_THREAD=TRUE diff --git a/firmware/config/boards/subaru_eg33/board.mk b/firmware/config/boards/subaru_eg33/board.mk index f40f2c25b0..d707100bd2 100644 --- a/firmware/config/boards/subaru_eg33/board.mk +++ b/firmware/config/boards/subaru_eg33/board.mk @@ -30,5 +30,15 @@ DDEFS += -DEFI_EMBED_INI_MSD=TRUE # Shared variables ALLINC += $(BOARDINC) -#Serial flash support +# this board has external QSPI NOR flash +# see also *STM32_WSPI* +DDEFS += -DHAL_USE_WSPI=TRUE +DDEFS += -DSNOR_SHARED_BUS=FALSE +DDEFS += -DWSPI_USE_MUTUAL_EXCLUSION=FALSE + +# This board uses ChibiOS MFS driver on internal flash +include $(PROJECT_DIR)/hw_layer/ports/stm32/calibrations_on_flash.mk + +#Serial flash driver include $(PROJECT_DIR)/hw_layer/drivers/flash/sst26f_jedec.mk + diff --git a/firmware/config/boards/subaru_eg33/efifeatures.h b/firmware/config/boards/subaru_eg33/efifeatures.h index 842e42a4e8..9731216b21 100644 --- a/firmware/config/boards/subaru_eg33/efifeatures.h +++ b/firmware/config/boards/subaru_eg33/efifeatures.h @@ -99,12 +99,3 @@ #define RPM_LOW_THRESHOLD 8 // RPM=8 is an empirical lower sensitivity threshold of MAX9926 for 60-2 #define NO_RPM_EVENTS_TIMEOUT_SECS 5 // (RPM < 12) - -#ifndef EFI_BOOTLOADER // bootloader needs INT_FLASH and doesn't have MFS -/* this board has external QSPI NOR flash */ -#undef EFI_STORAGE_MFS -#define EFI_STORAGE_MFS TRUE - -#undef EFI_STORAGE_INT_FLASH -#define EFI_STORAGE_INT_FLASH FALSE -#endif // EFI_BOOTLOADER diff --git a/firmware/config/boards/subaru_eg33/halconf.h b/firmware/config/boards/subaru_eg33/halconf.h index aaa7d4d824..27d3a31cbd 100644 --- a/firmware/config/boards/subaru_eg33/halconf.h +++ b/firmware/config/boards/subaru_eg33/halconf.h @@ -13,12 +13,6 @@ /* this file is exist just to include mcuconf.h from THIS directory */ #include "mcuconf.h" -#define HAL_USE_WSPI TRUE - -#define SNOR_SHARED_BUS FALSE - -#define WSPI_USE_MUTUAL_EXCLUSION FALSE - #include "../../../hw_layer/ports/stm32/stm32f7/cfg/halconf.h" #endif /* _HALCONF_SUBARUEG33_H_ */ diff --git a/firmware/hw_layer/ports/stm32/calibrations_on_flash.mk b/firmware/hw_layer/ports/stm32/calibrations_on_flash.mk new file mode 100644 index 0000000000..3e2b04c06b --- /dev/null +++ b/firmware/hw_layer/ports/stm32/calibrations_on_flash.mk @@ -0,0 +1,3 @@ +# see also 'HAL_USE_EFL' in case of internal flash + +DDEFS += -DEFI_STORAGE_INT_FLASH=FLASE -DEFI_STORAGE_MFS=TRUE