working

Author: mattia-moffa

arch.mk

@@ -800,21 +800,16 @@ ifeq ($(TARGET),imx_rt)
   CFLAGS+=\
       -I$(MCUXPRESSO_DRIVERS) \
       -I$(MCUXPRESSO_DRIVERS)/drivers \
-      -I$(MCUXPRESSO_DRIVERS)/../periph \
       -I$(MCUXPRESSO)/drivers \
       -I$(MCUXPRESSO)/drivers/cache/armv7-m7 \
       -I$(MCUXPRESSO)/drivers/common \
       -I$(MCUXPRESSO)/drivers/flexspi \
       -I$(MCUXPRESSO)/drivers/lpuart \
       -I$(MCUXPRESSO)/drivers/igpio \
       -I$(MCUXPRESSO)/components/uart \
-      -I$(MCUXPRESSO)/components/debug_console \
-      -I$(MCUXPRESSO)/components/debug_console/config \
-      -I$(MCUXPRESSO)/components/lists \
       -I$(MCUXPRESSO)/components/flash/nor \
       -I$(MCUXPRESSO)/components/flash/nor/flexspi \
       -I$(MCUXPRESSO)/components/serial_manager \
-      -I$(MCUXPRESSO)/components/str \
       -I$(MCUXPRESSO_DRIVERS)/project_template \
       -I$(MCUXPRESSO_CMSIS)/Include \
       -I$(MCUXPRESSO_CMSIS)/Core/Include
@@ -823,9 +818,15 @@ ifeq ($(TARGET),imx_rt)
       -DDEBUG_CONSOLE_ASSERT_DISABLE=1 \
       -DXIP_EXTERNAL_FLASH=1 -DDEBUG_CONSOLE_ASSERT_DISABLE=1 -DPRINTF_ADVANCED_ENABLE=1 \
       -DSCANF_ADVANCED_ENABLE=1 -DSERIAL_PORT_TYPE_UART=1 -DNDEBUG=1
-  CFLAGS+=-DDCB=CoreDebug -DDCB_DEMCR_TRCENA_Msk=CoreDebug_DEMCR_TRCENA_Msk
 
   ifeq ($(MCUXSDK),1)
+    CFLAGS+=\
+      -I$(MCUXPRESSO_DRIVERS)/../periph \
+      -I$(MCUXPRESSO)/components/debug_console \
+      -I$(MCUXPRESSO)/components/debug_console/config \
+      -I$(MCUXPRESSO)/components/lists \
+      -I$(MCUXPRESSO)/components/str
+    CFLAGS+=-DDCB=CoreDebug -DDCB_DEMCR_TRCENA_Msk=CoreDebug_DEMCR_TRCENA_Msk
     CFLAGS+=\
       -I$(MCUXPRESSO)/utilities/str \
       -I$(MCUXPRESSO)/utilities/debug_console
@@ -857,48 +858,72 @@ ifeq ($(TARGET),imx_rt)
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1064DVL6A)
     ARCH_FLASH_OFFSET=0x70000000
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/xip/
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/project_template
+    ifeq ($(MCUXSDK),1)
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/xip/
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/project_template
+    else
+      CFLAGS+=-I$(MCUXPRESSO)/boards/evkmimxrt1064/xip/
+    endif
   endif
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6A)
     ARCH_FLASH_OFFSET=0x60000000
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template
-    CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
+    ifeq ($(MCUXSDK),1)
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template
+      CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
+    else
+      CFLAGS+=-I$(MCUXPRESSO)/boards/evkmimxrt1060/xip/
+    endif
   endif
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6B)
     ARCH_FLASH_OFFSET=0x60000000
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/xip/
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/project_template
-    CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
+    ifeq ($(MCUXSDK),1)
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/xip/
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/project_template
+      CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
+    else
+      CFLAGS+=-I$(MCUXPRESSO)/boards/evkbmimxrt1060/xip/
+    endif
   endif
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1061CVJ5B)
     ARCH_FLASH_OFFSET=0x60000000
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template
-    CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
+    ifeq ($(MCUXSDK),1)
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template
+      CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
+    else
+      CFLAGS+=-I$(MCUXPRESSO)/boards/evkmimxrt1060/xip/
+    endif
   endif
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1052DVJ6B)
     ARCH_FLASH_OFFSET=0x60000000
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/xip/
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/project_template
+    ifeq ($(MCUXSDK),1)
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/xip/
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/project_template
+    else
+      CFLAGS+=-I$(MCUXPRESSO)/boards/evkbimxrt1050/xip/
+    endif
   endif
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1042XJM5B)
     ARCH_FLASH_OFFSET=0x60000000
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/xip/
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/project_template
-    CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
+    ifeq ($(MCUXSDK),1)
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/xip/
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/project_template
+      CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
+    else
+      CFLAGS+=-I$(MCUXPRESSO)/boards/evkmimxrt1040/xip/
+    endif
   endif
 
   ifeq ($(PKA),1)

test-app/Makefile

@@ -435,33 +435,58 @@ ifeq ($(TARGET),imx_rt)
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_common.o \
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_common_arm.o \
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_flexspi.o \
+      $(MCUXPRESSO_DRIVERS)/utilities/str/fsl_str.o \
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_lpuart.o \
-      $(MCUXPRESSO)/components/str/fsl_str.o \
-      $(MCUXPRESSO)/components/debug_console/fsl_debug_console.o
+      $(MCUXPRESSO_DRIVERS)/utilities/debug_console/fsl_debug_console.o
   endif
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1042XJM5B)
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/project_template \
-            -I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/xip/
+    ifeq ($(MCUXSDK),1)
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/project_template \
+              -I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/xip/
+    else
+      CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
+              -I$(MCUXPRESSO)/boards/evkmimxrt1040/xip/
+    endif
     APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1042.o
   else ifeq ($(MCUXPRESSO_CPU),MIMXRT1052DVJ6B)
-    CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/project_template \
-            -I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/xip/
+    ifeq ($(MCUXSDK),1)
+      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/project_template \
+              -I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/xip/
+    else
+      CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
+              -I$(MCUXPRESSO)/boards/evkmimxrt1050/xip/
+    endif
     APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1052.o
   else
     ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6A)
-      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template \
-              -I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
+      ifeq ($(MCUXSDK),1)
+        CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template \
+                -I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
+      else
+        CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
+                -I$(MCUXPRESSO)/boards/evkmimxrt1060/xip/
+      endif
       APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1062.o
     endif
     ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6B)
-      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/project_template \
-              -I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/xip/
+      ifeq ($(MCUXSDK),1)
+        CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/project_template \
+                -I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/xip/
+      else
+        CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
+                -I$(MCUXPRESSO)/boards/evkbmimxrt1060/xip/
+      endif
       APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1062.o
     endif
     ifeq ($(MCUXPRESSO_CPU),MIMXRT1064DVL6A)
-      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/project_template \
-              -I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/xip/
+      ifeq ($(MCUXSDK),1)
+        CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/project_template \
+                -I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/xip/
+      else
+        CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
+                -I$(MCUXPRESSO)/boards/evkmimxrt1064/xip/
+      endif
       APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1064.o
     endif
   endif