soc: nxp: Move flexspi log level change to driver
Single point of control over this kconfig's effect. Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
parent
57d777b640
commit
3c5df36dda
7 changed files with 12 additions and 71 deletions
|
@ -106,4 +106,9 @@ config FLASH_MCUX_FLEXSPI_HYPERFLASH_WRITE_BUFFER
|
|||
This prevents faults when the data to write would be located on the
|
||||
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
|
||||
|
|
|
@ -54,6 +54,11 @@ config MEMC_MCUX_FLEXSPI
|
|||
bool
|
||||
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
|
||||
|
||||
|
||||
|
|
|
@ -132,17 +132,4 @@ config FLASH_SIZE
|
|||
default $(dt_node_int_prop_int,$(DT_CHOSEN_FLASH_NODE),size,Kb) \
|
||||
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
|
||||
|
|
|
@ -62,19 +62,6 @@ config FLASH_SIZE
|
|||
if $(dt_node_has_prop,$(DT_CHOSEN_FLASH_NODE),size)
|
||||
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
|
||||
#
|
||||
|
|
|
@ -10,29 +10,4 @@ if SOC_FAMILY_NXP_MCX
|
|||
|
||||
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
|
||||
|
|
|
@ -3,19 +3,8 @@
|
|||
|
||||
if SOC_FAMILY_NXP_MCX
|
||||
|
||||
rsource "*/Kconfig.defconfig"
|
||||
|
||||
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
|
||||
config CODE_DATA_RELOCATION_SRAM
|
||||
default y
|
||||
|
@ -33,4 +22,6 @@ choice USB_MCUX_CONTROLLER_TYPE
|
|||
default USB_DC_NXP_EHCI
|
||||
endchoice
|
||||
|
||||
rsource "*/Kconfig.defconfig"
|
||||
|
||||
endif # SOC_FAMILY_NXP_MCX
|
||||
|
|
|
@ -61,15 +61,6 @@ endif # NXP_RW_ROM_RAMLOADER
|
|||
|
||||
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
|
||||
config CODE_DATA_RELOCATION_SRAM
|
||||
default y if MEMC
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue