michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: arm: rtxxx: moving the instances FLASH_MCUX_FLEXSPI_XIP

Browse source 
This Kconfig is moved to the soc level since it determines
the flexspi clock initialization for XIP.

Signed-off-by: Emilio Benavente <emilio.benavente@nxp.com>
This commit is contained in:
Emilio Benavente 2022-12-21 09:15:14 -06:00 • committed by Carles Cufí
commit 39762716d4
5 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/mimxrt595_evk/Kconfig.defconfig
View file

@ -11,10 +11,6 @@ config BOARD
config FLASH_MCUX_FLEXSPI_MX25UM51345G
default y if FLASH
config FLASH_MCUX_FLEXSPI_XIP
default y if FLASH
depends on MEMC_MCUX_FLEXSPI
choice FLASH_MCUX_FLEXSPI_XIP_MEM_TARGET
default FLASH_MCUX_FLEXSPI_XIP_MEM_SRAM
endchoice

4
boards/arm/mimxrt685_evk/Kconfig.defconfig
View file

@ -18,10 +18,6 @@ choice FLASH_MCUX_FLEXSPI_MX25UM51345G_OPI_MODE
default FLASH_MCUX_FLEXSPI_MX25UM51345G_OPI_STR
endchoice
config FLASH_MCUX_FLEXSPI_XIP
default y if FLASH
depends on MEMC_MCUX_FLEXSPI
choice FLASH_MCUX_FLEXSPI_XIP_MEM_TARGET
default FLASH_MCUX_FLEXSPI_XIP_MEM_SRAM
endchoice

2
doc/releases/release-notes-3.3.rst
View file

@ -297,7 +297,7 @@ Drivers and Sensors
* Ethernet
* Flash
* Flash: Moved CONFIG_FLASH_FLEXSPI_XIP into the SOC level due to the flexspi clock initialization occurring in the SOC level.
* NRF: Added CONFIG_SOC_FLASH_NRF_TIMEOUT_MULTIPLIER to allow tweaking the timeout of flash operations.

10
drivers/flash/Kconfig.mcux
View file

@ -100,16 +100,6 @@ config FLASH_MCUX_FLEXSPI_HYPERFLASH_WRITE_BUFFER
This prevents faults when the data to write would be located on the
flash itself.
config FLASH_MCUX_FLEXSPI_XIP
bool "MCUX FlexSPI flash access with xip"
default y
depends on MEMC_MCUX_FLEXSPI
depends on (CODE_FLEXSPI || CODE_FLEXSPI2 || SOC_SERIES_IMX_RT6XX)
select XIP
help
Allows using the flash API while running in XIP.
WARNING: It is possible to overwrite the running application itself.
if FLASH_MCUX_FLEXSPI_XIP
choice FLASH_MCUX_FLEXSPI_XIP_MEM_TARGET

19
soc/arm/nxp_imx/Kconfig
View file

@ -11,6 +11,15 @@ config SOC_FAMILY
string
default "nxp_imx"
# Used for default value in FLASH_MCUX_FLEXSPI_XIP
DT_CHOSEN_Z_FLASH := zephyr,flash
DT_COMPAT_FLEXSPI := nxp,imx-flexspi
# Macros to shorten Kconfig definitions
DT_CHOSEN_FLASH_NODE := $(dt_chosen_path,$(DT_CHOSEN_Z_FLASH))
DT_CHOSEN_FLASH_PARENT := $(dt_node_parent,$(DT_CHOSEN_FLASH_NODE))
source "soc/arm/nxp_imx/*/Kconfig.soc"
config SOC_PART_NUMBER
@ -23,4 +32,14 @@ config SOC_PART_NUMBER
default SOC_PART_NUMBER_IMX8ML_M7 if SOC_SERIES_IMX8ML_M7
default SOC_PART_NUMBER_IMX8MQ_M4 if SOC_SERIES_IMX8MQ_M4
config FLASH_MCUX_FLEXSPI_XIP
bool "MCUX FlexSPI flash access with xip"
default $(dt_node_has_compat,$(DT_CHOSEN_FLASH_PARENT),$(DT_COMPAT_FLEXSPI))
depends on (CODE_FLEXSPI || CODE_FLEXSPI2 || SOC_SERIES_IMX_RT6XX || SOC_SERIES_IMX_RT5XX)
select XIP
help
Allows for the soc to safely initialize the clocks for the
FlexSpi when planning to execute code in FlexSpi Memory.
endif # SOC_FAMILY_IMX