Update MCUXpresso SDK for iMX-RT too

Author: mattia-moffa

.github/workflows/test-configs.yml

@@ -42,74 +42,85 @@ jobs:
       config-file: ./config/examples/same51-dualbank.config
 
   imx_rt1040_test:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/imx-rt1040.config
+      board-name: evkmimxrt1040
 
   imx_rt1050_test:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/imx-rt1050.config
+      board-name: evkbimxrt1050
 
   imx_rt1060_test:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/imx-rt1060.config
+      board-name: evkbmimxrt1060
 
   imx_rt1064_test:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/imx-rt1064.config
+      board-name: evkmimxrt1064
 
   imx_rt1040_test_pka:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/imx-rt1040.config
+      board-name: evkmimxrt1040
       make-args: PKA=1 NO_ARM_ASM=1
 
   imx_rt1050_test_pka:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/imx-rt1050.config
+      board-name: evkbimxrt1050
       make-args: PKA=1 NO_ARM_ASM=1
 
   imx_rt1060_test_pka:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/imx-rt1060.config
+      board-name: evkbmimxrt1060
       make-args: PKA=1 NO_ARM_ASM=1
 
   imx_rt1064_test_pka:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/imx-rt1064.config
+      board-name: evkmimxrt1064
       make-args: PKA=1 NO_ARM_ASM=1
 
   imx_rt1060_hab_test:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/imx-rt1060_hab.config
+      board-name: evkbmimxrt1060
 
   kinetis_k64f_test:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/kinetis-k64f.config
+      board-name: frdmk64f
 
   kinetis_k82f_test:
-    uses: ./.github/workflows/test-build-mcux-sdk.yml
+    uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml
     with:
       arch: arm
       config-file: ./config/examples/kinetis-k82f.config
+      board-name: frdmk82f
 
   library_test:
     uses: ./.github/workflows/test-build.yml

arch.mk

@@ -827,9 +827,6 @@ ifeq ($(TARGET),imx_rt)
       -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
     OBJS+=\
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o \
       $(MCUXPRESSO)/drivers/flexspi/fsl_flexspi.o \
@@ -870,9 +867,10 @@ ifeq ($(TARGET),imx_rt)
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6A)
     ARCH_FLASH_OFFSET=0x60000000
     ifeq ($(MCUXSDK),1)
-      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
-      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060
-      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template
+      # Use evkbmimxrt1060 because evkmimxrt1060 is not supported by the SDK
+      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/evkmimxrt1060/xip/
@@ -894,9 +892,10 @@ ifeq ($(TARGET),imx_rt)
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1061CVJ5B)
     ARCH_FLASH_OFFSET=0x60000000
     ifeq ($(MCUXSDK),1)
-      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
-      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060
-      CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template
+      # Use evkbmimxrt1060 because evkmimxrt1060 is not supported by the SDK
+      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/evkmimxrt1060/xip/

config/examples/imx-rt1040.config

@@ -2,7 +2,7 @@ ARCH?=ARM
 TARGET?=imx_rt
 SIGN?=ECC256
 HASH?=SHA256
-MCUXSDK?=0
+MCUXSDK?=1
 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
 MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
 MCUXPRESSO_CPU?=MIMXRT1042XJM5B

config/examples/imx-rt1050.config

@@ -2,7 +2,7 @@ ARCH?=ARM
 TARGET?=imx_rt
 SIGN?=ECC256
 HASH?=SHA256
-MCUXSDK?=0
+MCUXSDK?=1
 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
 MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
 MCUXPRESSO_CPU?=MIMXRT1052DVJ6B

config/examples/imx-rt1060.config

@@ -2,7 +2,7 @@ ARCH?=ARM
 TARGET?=imx_rt
 SIGN?=ECC256
 HASH?=SHA256
-MCUXSDK?=0
+MCUXSDK?=1
 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
 MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
 MCUXPRESSO_CPU?=MIMXRT1062DVL6A

config/examples/imx-rt1060_hab.config

@@ -3,7 +3,7 @@ TARGET?=imx_rt
 TARGET_IMX_HAB?=1
 SIGN?=ECC256
 HASH?=SHA256
-MCUXSDK?=0
+MCUXSDK?=1
 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
 MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
 MCUXPRESSO_CPU?=MIMXRT1062DVL6A

config/examples/imx-rt1064.config

@@ -2,11 +2,11 @@ ARCH?=ARM
 TARGET?=imx_rt
 SIGN?=ECC256
 HASH?=SHA256
-MCUXSDK?=0
+MCUXSDK?=1
 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
 MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
 MCUXPRESSO_CPU?=MIMXRT1064DVL6A
-MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1060/MIMXRT1064
+MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1064/MIMXRT1064
 DEBUG?=0
 VTOR?=1
 CORTEX_M0?=0

hal/imx_rt.c

@@ -40,15 +40,15 @@
 #define USE_GET_CONFIG
 #endif
 #ifdef CPU_MIMXRT1062DVL6A
-#include "evkmimxrt1060_flexspi_nor_config.h"
+#include "evkbmimxrt1060_flexspi_nor_config.h"
 #define USE_GET_CONFIG
 #endif
 #ifdef CPU_MIMXRT1062DVL6B
 #include "evkbmimxrt1060_flexspi_nor_config.h"
 #define USE_GET_CONFIG
 #endif
 #ifdef CPU_MIMXRT1061CVJ5B
-#include "evkmimxrt1060_flexspi_nor_config.h"
+#include "evkbmimxrt1060_flexspi_nor_config.h"
 #define USE_GET_CONFIG
 #endif
 #ifdef CPU_MIMXRT1052DVJ6B