diff --git a/soc/nxp/rw/Kconfig b/soc/nxp/rw/Kconfig index 563b9671dba..5951cf59ab2 100644 --- a/soc/nxp/rw/Kconfig +++ b/soc/nxp/rw/Kconfig @@ -25,7 +25,7 @@ config INIT_SYS_PLL menuconfig NXP_RW6XX_BOOT_HEADER bool "Create boot header" - default y + default y if !BOOTLOADER_MCUBOOT help Create data structures required by the boot ROM to boot the application from an external flash device. @@ -57,6 +57,8 @@ config IMAGE_VECTOR_TABLE_OFFSET the application entry point and device configuration data. The boot ROM requires a fixed IVT offset for each type of boot device. +endif # NXP_RW6XX_BOOT_HEADER + # Used for default value in FLASH_MCUX_FLEXSPI_XIP DT_CHOSEN_Z_FLASH := zephyr,flash DT_COMPAT_FLEXSPI := nxp,imx-flexspi @@ -82,6 +84,9 @@ config NXP_RW_ROM_RAMLOADER FlexSPI boot device into RAM region. The image will be loaded from FLEXSPI into the region specified by `zephyr,flash` node. -endif # NXP_RW6XX_BOOT_HEADER +config FLASH_MCUX_FLEXSPI_XIP_MEM + string + default "RAM" + depends on MEMC_MCUX_FLEXSPI endif # SOC_SERIES_RW6XX diff --git a/soc/nxp/rw/Kconfig.defconfig b/soc/nxp/rw/Kconfig.defconfig index e17dffe663d..85f6cd5e825 100644 --- a/soc/nxp/rw/Kconfig.defconfig +++ b/soc/nxp/rw/Kconfig.defconfig @@ -63,6 +63,10 @@ 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 + endif # FLASH_MCUX_FLEXSPI_XIP endif # SOC_SERIES_RW6XX