From 7025f533d8580ca67c98f26d683005544bc6dfb7 Mon Sep 17 00:00:00 2001 From: Pieter De Gendt Date: Thu, 8 Apr 2021 18:21:35 +0200 Subject: [PATCH] mcux: Relocate FlexSPI driver with XIP Relocates the i.MX RT FlexSPI driver to the configured memory target if required. Signed-off-by: Pieter De Gendt --- mcux/drivers/imx/CMakeLists.txt | 4 ++++ mcux/drivers/imxrt6xx/CMakeLists.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/mcux/drivers/imx/CMakeLists.txt b/mcux/drivers/imx/CMakeLists.txt index 927995bd13..10703eec26 100644 --- a/mcux/drivers/imx/CMakeLists.txt +++ b/mcux/drivers/imx/CMakeLists.txt @@ -36,6 +36,10 @@ zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_CSI fsl_csi.c) zephyr_library_sources_ifdef(CONFIG_WDT_MCUX_IMX_WDOG fsl_wdog.c) zephyr_library_sources_ifdef(CONFIG_CAN_MCUX_FLEXCAN fsl_flexcan.c) +if(CONFIG_FLASH_MCUX_FLEXSPI_XIP) + zephyr_code_relocate(fsl_flexspi.c ${CONFIG_FLASH_MCUX_FLEXSPI_XIP_MEM}_TEXT) +endif() + if(NOT CONFIG_ASSERT OR CONFIG_FORCE_NO_ASSERT) zephyr_compile_definitions(NDEBUG) # squelch fsl_flexcan.c warning endif() diff --git a/mcux/drivers/imxrt6xx/CMakeLists.txt b/mcux/drivers/imxrt6xx/CMakeLists.txt index 54aaf271e7..cda9e008f2 100644 --- a/mcux/drivers/imxrt6xx/CMakeLists.txt +++ b/mcux/drivers/imxrt6xx/CMakeLists.txt @@ -21,3 +21,7 @@ zephyr_sources_ifdef(CONFIG_DMA_MCUX_LPC fsl_dma.c) zephyr_sources_ifdef(CONFIG_MCUX_ACMP fsl_acmp.c) zephyr_sources_ifdef(CONFIG_MEMC_MCUX_FLEXSPI fsl_flexspi.c) zephyr_sources_ifdef(CONFIG_MCUX_OS_TIMER fsl_ostimer.c) + +if(CONFIG_FLASH_MCUX_FLEXSPI_XIP) + zephyr_code_relocate(fsl_flexspi.c ${CONFIG_FLASH_MCUX_FLEXSPI_XIP_MEM}_TEXT) +endif()