michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: imxrt: Fix flexspi xip configuration issue

Browse source 
Fix flexspi xip configuration issue regarding code relocation
due to the order of kconfig defaults being sourced

The flexspi setup was not being relocated to an on chip location

Also remove rt1060 conf file in flash common test which changes the
code relocation location to RAM, just keep as ITCM for all M7 which
as of now all have ITCM from NXP with flexspi.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-09-05 19:37:05 -05:00 • committed by Fabio Baltieri
commit d931f0b7c0
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
soc/nxp/common/Kconfig.flexspi_xip
View file

@ -28,14 +28,20 @@ config FLASH_MCUX_FLEXSPI_XIP
Allows REfor the soc to safely initialize the clocks for the
FlexSpi when planning to execute code in FlexSpi Memory.
if FLASH_MCUX_FLEXSPI_XIP && MEMC_MCUX_FLEXSPI
config CODE_DATA_RELOCATION_SRAM
default y if FLASH_MCUX_FLEXSPI_XIP && MEMC_MCUX_FLEXSPI
default y if !CPU_CORTEX_M7
config CODE_DATA_RELOCATION
default y if CPU_CORTEX_M7
config FLASH_MCUX_FLEXSPI_XIP_MEM
string
prompt "Flexspi drivers memory location"
default "RAM"
depends on MEMC_MCUX_FLEXSPI && FLASH_MCUX_FLEXSPI_XIP
help
Select the location to run the FlexSPI drivers when using
the flash API.
endif

3
soc/nxp/imxrt/Kconfig.defconfig
View file

@ -114,9 +114,6 @@ config CACHE_MANAGEMENT
config FLASH_MCUX_FLEXSPI_XIP_MEM
default "ITCM"
config CODE_DATA_RELOCATION_SRAM
default n
endif # CPU_CORTEX_M7
endif # SOC_SERIES_IMXRT10XX || SOC_SERIES_IMXRT11XX || SOC_SERIES_IMXRT118X

6
tests/drivers/flash/common/boards/mimxrt1060_evk.conf
View file

@ -1,6 +0,0 @@
#
# Copyright (c) 2021 NXP.
# SPDX-License-Identifier: Apache-2.0
#
CONFIG_FLASH_MCUX_FLEXSPI_XIP_MEM="RAM"