From a5994dbd1a5f52092f3b77f7903e51ccc7e99e1a Mon Sep 17 00:00:00 2001 From: Daniel DeGrasse Date: Thu, 22 Dec 2022 15:22:51 -0600 Subject: [PATCH] drivers: memc: don't relocate MEMC functions unless CONFIG_FLASH=y Only relocate memc driver when CONFIG_FLASH=y. CONFIG_FLASH_MCUX_FLEXSPI_XIP previously was dependent on CONFIG_FLASH, but the scope of this Kconfig has changed. Due to this, the memc driver now must have two checks, as it should not relocated when the driver is being used for a memory controller that does not expose the flash driver interface. Since the NXP HAL also relocates the underlying FlexSPI driver using a similar check, it is updated in this commit as well. Signed-off-by: Daniel DeGrasse --- drivers/memc/CMakeLists.txt | 2 +- west.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/memc/CMakeLists.txt b/drivers/memc/CMakeLists.txt index 020f791683..cec866fa2c 100644 --- a/drivers/memc/CMakeLists.txt +++ b/drivers/memc/CMakeLists.txt @@ -12,6 +12,6 @@ zephyr_library_sources_ifdef(CONFIG_MEMC_MCUX_FLEXSPI_HYPERRAM memc_mcux_flexspi zephyr_library_sources_ifdef(CONFIG_MEMC_SAM_SMC memc_sam_smc.c) -if(CONFIG_FLASH_MCUX_FLEXSPI_XIP) +if((DEFINED CONFIG_FLASH_MCUX_FLEXSPI_XIP) AND (DEFINED CONFIG_FLASH)) zephyr_code_relocate(memc_mcux_flexspi.c ${CONFIG_FLASH_MCUX_FLEXSPI_XIP_MEM}_TEXT) endif() diff --git a/west.yml b/west.yml index 6195fc1634..cfe6cfc94e 100644 --- a/west.yml +++ b/west.yml @@ -93,7 +93,7 @@ manifest: groups: - hal - name: hal_nxp - revision: 0594f3042da3ddc0f7e590142b0ff3e5935257ca + revision: d33133de8863aac13bf826c02786fc9310380746 path: modules/hal/nxp groups: - hal