imxrt: use global __CPU_* as target cpu selector

Replaces redundant target cpu selectors provided locally by plo with global __CPU_* from phoenix-rtos-build system. JIRA: RTOS-519
phoenix-rtos · Jul 13, 2023 · d4bcee3 · d4bcee3
1 parent 3fd015a
commit d4bcee3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/devices/flash-flexspi/flashdrv.c b/devices/flash-flexspi/flashdrv.c
@@ -36,7 +36,7 @@ static inline int minorToInstance(unsigned int minor)
 		case 0:
 			return flexspi_instance1;
 
-#if defined(IMXRT106X) || defined(IMXRT117X)
+#if defined(__CPU_IMXRT106X) || defined(__CPU_IMXRT117X)
 		case 1:
 			return flexspi_instance2;
 #endif
@@ -53,12 +53,12 @@ static inline int minorToPortMask(unsigned int minor)
 		case 0:
 			return flexspi_slBusA1;
 
-#if defined(IMXRT106X)
+#if defined(__CPU_IMXRT106X)
 		case 1:
 			return flexspi_slBusA1;
 #endif
 
-#if defined(IMXRT117X)
+#if defined(__CPU_IMXRT117X)
 		case 1:
 			return flexspi_slBusA1 | flexspi_slBusA2;
 #endif

diff --git a/devices/flash-flexspi/fspi/fspi.c b/devices/flash-flexspi/fspi/fspi.c
@@ -21,11 +21,11 @@
 
 
 /* Include platform dependent pin config */
-#if defined(IMXRT117X)
+#if defined(__CPU_IMXRT117X)
 #include "fspi_rt117x.h"
-#elif defined(IMXRT106X)
+#elif defined(__CPU_IMXRT106X)
 #include "fspi_rt106x.h"
-#elif defined(IMXRT105X)
+#elif defined(__CPU_IMXRT105X)
 #include "fspi_rt105x.h"
 #else
 #error "FlexSPI is not supported on this target"

diff --git a/hal/armv7m/exceptions.c b/hal/armv7m/exceptions.c
@@ -18,7 +18,7 @@
 
 #define SIZE_FPUCTX (16 * sizeof(u32))
 
-#ifdef CPU_IMXRT
+#if defined(__CPU_IMXRT106X) || defined(__CPU_IMXRT105X) || defined(__CPU_IMXRT117X)
 #define EXCRET_PSP 0xffffffed
 #else
 #define EXCRET_PSP 0xfffffffd