Skip to content

Commit f66658a

Browse files
JarmouniAdanieldegrasse
authored andcommitted
soc: stm32: fix FLASH_BASE_ADDR for apps linked in ext Q/OSPI Flash
Following changes in e35ac8f and 14c1b4a to how external Q/OSPI Flash nodes are declared in DT for boards with STM32 SoCs, FLASH_BASE_ADDRESS needs to be set manually similar to XSPI Flash, so that it does not default to (dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH)) which gives 0. This change is critical for running apps with MCUboot from external Q/OSPI Flash. Signed-off-by: Abderrahmane JARMOUNI <git@jarmouni.me>
1 parent d84348f commit f66658a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

soc/st/stm32/Kconfig.defconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,14 @@ DT_STM32_LPTIM_PATH := $(dt_nodelabel_path,stm32_lp_tick_source)
2828

2929
DT_CHOSEN_Z_FLASH := zephyr,flash
3030
DT_COMPAT_XSPI := st,stm32-xspi
31+
DT_COMPAT_OSPI := st,stm32-ospi
32+
DT_COMPAT_QSPI := st,stm32-qspi
3133

3234
DT_CHOSEN_FLASH_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_FLASH))
3335
DT_CHOSEN_FLASH_PARENT := $(dt_node_parent,$(DT_CHOSEN_FLASH_NODE))
3436
DT_FLASH_PARENT_IS_XSPI := $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_XSPI))
37+
DT_FLASH_PARENT_IS_OSPI := $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_OSPI))
38+
DT_FLASH_PARENT_IS_QSPI := $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_QSPI))
3539

3640
config SYS_CLOCK_HW_CYCLES_PER_SEC
3741
default "$(DT_STM32_RCC_CLOCK_FREQ)" if "$(dt_nodelabel_enabled,rcc)"
@@ -82,7 +86,7 @@ config BUILD_WITH_TFM
8286

8387
config FLASH_BASE_ADDRESS
8488
default $(dt_node_reg_addr_hex,$(DT_CHOSEN_FLASH_PARENT),1) \
85-
if $(DT_FLASH_PARENT_IS_XSPI)
89+
if $(DT_FLASH_PARENT_IS_XSPI) || $(DT_FLASH_PARENT_IS_OSPI) || $(DT_FLASH_PARENT_IS_QSPI)
8690
default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))
8791

8892
# The XSPI PSRAM driver creates a SMH region with attribute SMH_REG_ATTR_EXTERNAL (2)

0 commit comments

Comments
 (0)