michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: nxp: Move flexspi log level change to driver

Browse source 
Single point of control over this kconfig's effect.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-08-09 15:33:18 -05:00 • committed by Alberto Escolar
commit 3c5df36dda
7 changed files with 12 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/flash/Kconfig.mcux
View file

@ -106,4 +106,9 @@ config FLASH_MCUX_FLEXSPI_HYPERFLASH_WRITE_BUFFER
This prevents faults when the data to write would be located on the This prevents faults when the data to write would be located on the
flash itself. flash itself.
# Avoid RWW hazards by defaulting logging to disabled
choice FLASH_LOG_LEVEL_CHOICE
default FLASH_LOG_LEVEL_OFF if FLASH_MCUX_FLEXSPI_XIP
endchoice
endif # HAS_MCUX_FLEXSPI endif # HAS_MCUX_FLEXSPI

5
drivers/memc/Kconfig.mcux
View file

@ -54,6 +54,11 @@ config MEMC_MCUX_FLEXSPI
bool bool
select PINCTRL select PINCTRL
# Avoid RWW hazards by defaulting logging to disabled
choice MEMC_LOG_LEVEL_CHOICE
default MEMC_LOG_LEVEL_OFF if FLASH_MCUX_FLEXSPI_XIP
endchoice
endif # DT_HAS_NXP_IMX_FLEXSPI_ENABLED endif # DT_HAS_NXP_IMX_FLEXSPI_ENABLED

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

@ -132,17 +132,4 @@ config FLASH_SIZE
default $(dt_node_int_prop_int,$(DT_CHOSEN_FLASH_NODE),size,Kb) \ default $(dt_node_int_prop_int,$(DT_CHOSEN_FLASH_NODE),size,Kb) \
if $(DT_FLASH_HAS_SIZE_PROP) if $(DT_FLASH_HAS_SIZE_PROP)
if FLASH_MCUX_FLEXSPI_XIP
# Avoid RWW hazards by defaulting logging to disabled
choice FLASH_LOG_LEVEL_CHOICE
default FLASH_LOG_LEVEL_OFF
endchoice
choice MEMC_LOG_LEVEL_CHOICE
default MEMC_LOG_LEVEL_OFF
endchoice
endif
endif # SOC_FAMILY_NXP_IMXRT endif # SOC_FAMILY_NXP_IMXRT

13
soc/nxp/imxrt/imxrt6xx/Kconfig.defconfig
View file

@ -62,19 +62,6 @@ config FLASH_SIZE
if $(dt_node_has_prop,$(DT_CHOSEN_FLASH_NODE),size) if $(dt_node_has_prop,$(DT_CHOSEN_FLASH_NODE),size)
default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K) default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_FLASH),0,K)
if FLASH_MCUX_FLEXSPI_XIP
# Avoid RWW hazards by defaulting logging to disabled
choice FLASH_LOG_LEVEL_CHOICE
default FLASH_LOG_LEVEL_OFF
endchoice
choice MEMC_LOG_LEVEL_CHOICE
default MEMC_LOG_LEVEL_OFF
endchoice
endif
# #
# MBEDTLS is larger but much faster than TinyCrypt so choose wisely # MBEDTLS is larger but much faster than TinyCrypt so choose wisely
# #

25
soc/nxp/mcx/Kconfig
View file

@ -10,29 +10,4 @@ if SOC_FAMILY_NXP_MCX
rsource "*/Kconfig" rsource "*/Kconfig"
if FLASH_MCUX_FLEXSPI_XIP
# Avoid RWW hazards by defaulting logging to disabled
choice FLASH_LOG_LEVEL_CHOICE
default FLASH_LOG_LEVEL_OFF
endchoice
choice MEMC_LOG_LEVEL_CHOICE
default MEMC_LOG_LEVEL_OFF
endchoice
endif
if FLASH_MCUX_FLEXSPI_XIP
# Code relocation is needed when FLASH_MCUX_FLEXSPI_XIP is enabled
config CODE_DATA_RELOCATION_SRAM
default y
config FLASH_MCUX_FLEXSPI_XIP_MEM
string
default "RAM"
endif # FLASH_MCUX_FLEXSPI_XIP
endif # SOC_FAMILY_NXP_MCX endif # SOC_FAMILY_NXP_MCX

13
soc/nxp/mcx/Kconfig.defconfig
View file

@ -3,19 +3,8 @@
if SOC_FAMILY_NXP_MCX if SOC_FAMILY_NXP_MCX
rsource "*/Kconfig.defconfig"
if FLASH_MCUX_FLEXSPI_XIP if FLASH_MCUX_FLEXSPI_XIP
# Avoid RWW hazards by defaulting logging to disabled
choice FLASH_LOG_LEVEL_CHOICE
default FLASH_LOG_LEVEL_OFF
endchoice
choice MEMC_LOG_LEVEL_CHOICE
default MEMC_LOG_LEVEL_OFF
endchoice
# Code relocation is needed when FLASH_MCUX_FLEXSPI_XIP is enabled # Code relocation is needed when FLASH_MCUX_FLEXSPI_XIP is enabled
config CODE_DATA_RELOCATION_SRAM config CODE_DATA_RELOCATION_SRAM
default y default y
@ -33,4 +22,6 @@ choice USB_MCUX_CONTROLLER_TYPE
default USB_DC_NXP_EHCI default USB_DC_NXP_EHCI
endchoice endchoice
rsource "*/Kconfig.defconfig"
endif # SOC_FAMILY_NXP_MCX endif # SOC_FAMILY_NXP_MCX

9
soc/nxp/rw/Kconfig.defconfig
View file

@ -61,15 +61,6 @@ endif # NXP_RW_ROM_RAMLOADER
if FLASH_MCUX_FLEXSPI_XIP if FLASH_MCUX_FLEXSPI_XIP
# Avoid RWW hazards by defaulting logging to disabled
choice FLASH_LOG_LEVEL_CHOICE
default FLASH_LOG_LEVEL_OFF
endchoice
choice MEMC_LOG_LEVEL_CHOICE
default MEMC_LOG_LEVEL_OFF
endchoice
# Code relocation is needed when MEMC driver is enabled # Code relocation is needed when MEMC driver is enabled
config CODE_DATA_RELOCATION_SRAM config CODE_DATA_RELOCATION_SRAM
default y if MEMC default y if MEMC