soc: imxrt: Fix flexspi xip configuration issue

Fix flexspi xip configuration issue regarding code relocation
due to the order of kconfig defaults being sourced

The flexspi setup was not being relocated to an on chip location

Also remove rt1060 conf file in flash common test which changes the
code relocation location to RAM, just keep as ITCM for all M7 which
as of now all have ITCM from NXP with flexspi.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>

Author: decsny

soc/nxp/common/Kconfig.flexspi_xip

@@ -28,14 +28,20 @@ config FLASH_MCUX_FLEXSPI_XIP
 	  Allows REfor the soc to safely initialize the clocks for the
 	  FlexSpi when planning to execute code in FlexSpi Memory.
 
+if FLASH_MCUX_FLEXSPI_XIP && MEMC_MCUX_FLEXSPI
+
 config CODE_DATA_RELOCATION_SRAM
-	default y if FLASH_MCUX_FLEXSPI_XIP && MEMC_MCUX_FLEXSPI
+	default y if !CPU_CORTEX_M7
+
+config CODE_DATA_RELOCATION
+	default y if CPU_CORTEX_M7
 
 config FLASH_MCUX_FLEXSPI_XIP_MEM
 	string
 	prompt "Flexspi drivers memory location"
 	default "RAM"
-	depends on MEMC_MCUX_FLEXSPI && FLASH_MCUX_FLEXSPI_XIP
 	help
 	  Select the location to run the FlexSPI drivers when using
 	  the flash API.
+
+endif

soc/nxp/imxrt/Kconfig.defconfig

@@ -114,9 +114,6 @@ config CACHE_MANAGEMENT
 config FLASH_MCUX_FLEXSPI_XIP_MEM
 	default "ITCM"
 
-config CODE_DATA_RELOCATION_SRAM
-	default n
-
 endif # CPU_CORTEX_M7
 
 endif # SOC_SERIES_IMXRT10XX || SOC_SERIES_IMXRT11XX || SOC_SERIES_IMXRT118X