Update MCUXpresso SDK to new refactor

.github/workflows/test-configs.yml

@@ -42,62 +42,71 @@ 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: evkbmimxrt1060
 
   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: evkbmimxrt1060
 
   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: evkbmimxrt1060
       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: evkbmimxrt1060
       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
@@ -125,10 +134,11 @@ jobs:
       config-file: ./config/examples/library.config
 
   lpc54606j512_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/lpc54606j512.config
+      board-name: lpcxpresso55s06
 
   nrf52840_test:
     uses: ./.github/workflows/test-build.yml
@@ -199,22 +209,25 @@ jobs:
       make-args: CROSS_COMPILE=aarch64-linux-gnu-
 
   nxp_mcxa_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/mcxa.config
+      board-name: frdmmcxa153
 
   nxp_mcxw_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/mcxw.config
+      board-name: frdmmcxw71
 
   nxp_mcxw_tz_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/mcxw-tz.config
+      board-name: frdmmcxw71
 
   nxp_mcxn_test:
     uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml

arch.mk

@@ -689,6 +689,8 @@ ifeq ($(TARGET),mcxa)
       -I$(MCUXPRESSO_DRIVERS) \
       -I$(MCUXPRESSO_DRIVERS)/drivers \
       -I$(MCUXPRESSO_DRIVERS)/drivers/common \
+      -I$(MCUXPRESSO_DRIVERS)/drivers/romapi \
+      -I$(MCUXPRESSO_DRIVERS)/../periph \
       -I$(MCUXPRESSO)/drivers \
       -I$(MCUXPRESSO)/drivers/common \
       -I$(MCUXPRESSO_CMSIS)/Include \
@@ -707,7 +709,7 @@ ifeq ($(TARGET),mcxa)
   OBJS+=\
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o \
       $(MCUXPRESSO)/drivers/mcx_spc/fsl_spc.o \
-	  $(MCUXPRESSO_DRIVERS)/project_template/clock_config.o
+      $(MCUXPRESSO_PROJECT_TEMPLATE)/clock_config.o
 endif
 
 ifeq ($(TARGET),mcxw)
@@ -718,7 +720,8 @@ ifeq ($(TARGET),mcxw)
   CFLAGS+=\
       -I$(MCUXPRESSO_DRIVERS) \
       -I$(MCUXPRESSO_DRIVERS)/drivers \
-	  -I$(MCUXPRESSO_DRIVERS)/periph2 \
+      -I$(MCUXPRESSO_DRIVERS)/drivers/romapi \
+      -I$(MCUXPRESSO_DRIVERS)/../periph2 \
       -I$(MCUXPRESSO)/drivers \
       -I$(MCUXPRESSO)/drivers/flash_k4 \
       -I$(MCUXPRESSO)/drivers/ccm32k \
@@ -739,9 +742,9 @@ ifeq ($(TARGET),mcxw)
   OBJS+=\
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o \
       $(MCUXPRESSO)/drivers/spc/fsl_spc.o \
-	  $(MCUXPRESSO_DRIVERS)/project_template/clock_config.o \
+      $(MCUXPRESSO_PROJECT_TEMPLATE)/clock_config.o \
       $(MCUXPRESSO)/drivers/ccm32k/fsl_ccm32k.o \
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_romapi.o
+      $(MCUXPRESSO_DRIVERS)/drivers/romapi/fsl_romapi.o
 endif
 
 ifeq ($(TARGET),mcxn)
@@ -818,8 +821,12 @@ ifeq ($(TARGET),imx_rt)
 
   ifeq ($(MCUXSDK),1)
     CFLAGS+=\
-      -I$(MCUXPRESSO)/utilities/str \
-      -I$(MCUXPRESSO)/utilities/debug_console
+      -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
     OBJS+=\
       $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o \
       $(MCUXPRESSO)/drivers/flexspi/fsl_flexspi.o \
@@ -848,32 +855,74 @@ ifeq ($(TARGET),imx_rt)
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1064DVL6A)
     ARCH_FLASH_OFFSET=0x70000000
-    CFLAGS+=-I$(MCUXPRESSO)/boards/evkmimxrt1064/xip/
+    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)/boards/evkmimxrt1060/xip/
+    ifeq ($(MCUXSDK),1)
+      # 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/
+    endif
   endif
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6B)
     ARCH_FLASH_OFFSET=0x60000000
-    CFLAGS+=-I$(MCUXPRESSO)/boards/evkbmimxrt1060/xip/
+    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)/boards/evkmimxrt1060/xip/
+    ifeq ($(MCUXSDK),1)
+      # 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/
+    endif
   endif
 
   ifeq ($(MCUXPRESSO_CPU),MIMXRT1052DVJ6B)
     ARCH_FLASH_OFFSET=0x60000000
-    CFLAGS+=-I$(MCUXPRESSO)/boards/evkbimxrt1050/xip/
+    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)/boards/evkmimxrt1040/xip/
+    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)
@@ -987,22 +1036,34 @@ ifeq ($(TARGET),ti_hercules)
 endif
 
 ifeq ($(TARGET),lpc)
-  CFLAGS+=\
-      -I$(MCUXPRESSO_DRIVERS) \
-      -I$(MCUXPRESSO_DRIVERS)/drivers \
-      -I$(MCUXPRESSO)/drivers \
-      -I$(MCUXPRESSO)/drivers/common \
-      -I$(MCUXPRESSO_CMSIS)/Include \
-      -I$(MCUXPRESSO_CMSIS)/Core/Include
-  CFLAGS+=\
-      -DCPU_$(MCUXPRESSO_CPU) -DDEBUG_CONSOLE_ASSERT_DISABLE=1
-  OBJS+=\
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o \
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_power.o \
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_reset.o
-  LIBS+=\
-      $(MCUXPRESSO_DRIVERS)/mcuxpresso/libpower_softabi.a
   ifeq ($(MCUXSDK),1)
+    # Some targets in the SDK use drivers from a different target
+    MCUXPRESSO_DRIVERS_SHARED?=$(MCUXPRESSO_DRIVERS)
+    ifneq (,$(filter LPC54628%,$(MCUXPRESSO_CPU)))
+      MCUXPRESSO_DRIVERS_SHARED=$(MCUXPRESSO)/devices/LPC/LPC54000/LPC54628
+    else ifneq (,$(filter LPC54605% LPC54606% LPC54607% LPC54608% LPC54616% LPC54618%,$(MCUXPRESSO_CPU)))
+      MCUXPRESSO_DRIVERS_SHARED=$(MCUXPRESSO)/devices/LPC/LPC54000/LPC54608
+    else ifneq (,$(filter LPC54018M% LPC54S018M%,$(MCUXPRESSO_CPU)))
+      MCUXPRESSO_DRIVERS_SHARED=$(MCUXPRESSO)/devices/LPC/LPC54000/LPC54S018M
+    else ifneq (,$(filter LPC54005% LPC54016% LPC54018% LPC54S005% LPC54S016% LPC54S018%,$(MCUXPRESSO_CPU)))
+      MCUXPRESSO_DRIVERS_SHARED=$(MCUXPRESSO)/devices/LPC/LPC54000/LPC54S018
+    endif
+    CFLAGS+=\
+        -I$(MCUXPRESSO_DRIVERS) \
+        -I$(MCUXPRESSO_DRIVERS_SHARED)/drivers \
+        -I$(MCUXPRESSO_DRIVERS)/../periph \
+        -I$(MCUXPRESSO)/drivers \
+        -I$(MCUXPRESSO)/drivers/common \
+        -I$(MCUXPRESSO)/drivers/flashiap \
+        -I$(MCUXPRESSO_CMSIS)/Include \
+        -I$(MCUXPRESSO_CMSIS)/Core/Include
+    CFLAGS+=\
+        -DCPU_$(MCUXPRESSO_CPU) -DDEBUG_CONSOLE_ASSERT_DISABLE=1
+    CFLAGS+=-DDCB=CoreDebug -DDCB_DEMCR_TRCENA_Msk=CoreDebug_DEMCR_TRCENA_Msk
+    OBJS+=\
+        $(MCUXPRESSO_DRIVERS_SHARED)/drivers/fsl_clock.o \
+        $(MCUXPRESSO_DRIVERS_SHARED)/drivers/fsl_power.o \
+        $(MCUXPRESSO_DRIVERS_SHARED)/drivers/fsl_reset.o
     CFLAGS+=\
       -I$(MCUXPRESSO)/drivers/flashiap \
       -I$(MCUXPRESSO)/drivers/flexcomm
@@ -1013,11 +1074,26 @@ ifeq ($(TARGET),lpc)
       $(MCUXPRESSO)/drivers/flexcomm/usart/fsl_usart.o \
       $(MCUXPRESSO)/drivers/flexcomm/fsl_flexcomm.o
   else
+    CFLAGS+=\
+        -I$(MCUXPRESSO_DRIVERS) \
+        -I$(MCUXPRESSO_DRIVERS)/drivers \
+        -I$(MCUXPRESSO)/drivers \
+        -I$(MCUXPRESSO)/drivers/common \
+        -I$(MCUXPRESSO_CMSIS)/Include \
+        -I$(MCUXPRESSO_CMSIS)/Core/Include
+    CFLAGS+=\
+        -DCPU_$(MCUXPRESSO_CPU) -DDEBUG_CONSOLE_ASSERT_DISABLE=1
+    OBJS+=\
+        $(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o \
+        $(MCUXPRESSO_DRIVERS)/drivers/fsl_power.o \
+        $(MCUXPRESSO_DRIVERS)/drivers/fsl_reset.o
+    LIBS+=\
+        $(MCUXPRESSO_DRIVERS)/mcuxpresso/libpower_softabi.a
     OBJS+=\
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_common.o \
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_flashiap.o \
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_usart.o \
-      $(MCUXPRESSO_DRIVERS)/drivers/fsl_flexcomm.o
+        $(MCUXPRESSO_DRIVERS)/drivers/fsl_common.o \
+        $(MCUXPRESSO_DRIVERS)/drivers/fsl_flashiap.o \
+        $(MCUXPRESSO_DRIVERS)/drivers/fsl_usart.o \
+        $(MCUXPRESSO_DRIVERS)/drivers/fsl_flexcomm.o
   endif
 endif
 

config/examples/imx-rt1040.config

@@ -3,10 +3,10 @@ TARGET?=imx_rt
 SIGN?=ECC256
 HASH?=SHA256
 MCUXSDK?=0
-MCUXPRESSO?=$(PWD)/../SDK_2_14_0_EVKB-IMXRT1040
-MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
+MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
+MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
 MCUXPRESSO_CPU?=MIMXRT1042XJM5B
-MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1042
+MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1040/MIMXRT1042
 DEBUG?=0
 VTOR?=1
 CORTEX_M0?=0

config/examples/imx-rt1050.config

@@ -3,10 +3,10 @@ TARGET?=imx_rt
 SIGN?=ECC256
 HASH?=SHA256
 MCUXSDK?=0
-MCUXPRESSO?=$(PWD)/../SDK_2_14_0_EVKB-IMXRT1050
-MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
+MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
+MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
 MCUXPRESSO_CPU?=MIMXRT1052DVJ6B
-MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1052
+MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
 DEBUG?=0
 VTOR?=1
 CORTEX_M0?=0

config/examples/imx-rt1060.config

@@ -3,10 +3,10 @@ TARGET?=imx_rt
 SIGN?=ECC256
 HASH?=SHA256
 MCUXSDK?=0
-MCUXPRESSO?=$(PWD)/../SDK-2.11.0_EVK-MIMXRT1060
-MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
+MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
+MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
 MCUXPRESSO_CPU?=MIMXRT1062DVL6A
-MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1062
+MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1060/MIMXRT1062
 DEBUG?=0
 VTOR?=1
 CORTEX_M0?=0

config/examples/imx-rt1060_hab.config

@@ -4,10 +4,10 @@ TARGET_IMX_HAB?=1
 SIGN?=ECC256
 HASH?=SHA256
 MCUXSDK?=0
-MCUXPRESSO?=$(PWD)/../SDK-2.11.0_EVK-MIMXRT1060
-MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
+MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
+MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
 MCUXPRESSO_CPU?=MIMXRT1062DVL6A
-MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1062
+MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1060/MIMXRT1062
 DEBUG?=0
 VTOR?=1
 CORTEX_M0?=0