From 109dbd08d9df090ec64f64d82d12060da9735445 Mon Sep 17 00:00:00 2001 From: Mattia Moffa Date: Thu, 29 Jan 2026 17:35:24 +0100 Subject: [PATCH 1/6] Update MCUXpresso SDK to new refactor Updates targets using the deprecated https://github.com/nxp-mcuxpresso/legacy-mcux-sdk to use https://github.com/nxp-mcuxpresso/mcuxsdk-manifests instead. --- .github/workflows/test-configs.yml | 9 ++-- arch.mk | 76 ++++++++++++++++++++--------- config/examples/lpc54606j512.config | 8 +-- config/examples/mcxa.config | 6 ++- config/examples/mcxw-tz.config | 5 +- config/examples/mcxw.config | 5 +- docs/Targets.md | 47 ++++++++++++++++-- test-app/Makefile | 6 +-- 8 files changed, 119 insertions(+), 43 deletions(-) diff --git a/.github/workflows/test-configs.yml b/.github/workflows/test-configs.yml index a3272108ae..f0eaa45aea 100644 --- a/.github/workflows/test-configs.yml +++ b/.github/workflows/test-configs.yml @@ -199,22 +199,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 diff --git a/arch.mk b/arch.mk index 7c1c04cc20..f74df0f222 100644 --- a/arch.mk +++ b/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) @@ -987,22 +990,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 +1028,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 diff --git a/config/examples/lpc54606j512.config b/config/examples/lpc54606j512.config index 209b524246..88168f856e 100644 --- a/config/examples/lpc54606j512.config +++ b/config/examples/lpc54606j512.config @@ -1,11 +1,11 @@ ARCH?=ARM TARGET?=lpc SIGN?=ECC256 -MCUXSDK?=0 -MCUXPRESSO?=$(PWD)/../FRDM-K64F -MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS +MCUXSDK?=1 +MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk +MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=LPC54606J512BD208 -MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/LPC54606 +MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/LPC/LPC54000/LPC54606 DEBUG?=0 HASH?=SHA256 VTOR?=1 diff --git a/config/examples/mcxa.config b/config/examples/mcxa.config index 6a3c20f214..eb9a05a9ea 100644 --- a/config/examples/mcxa.config +++ b/config/examples/mcxa.config @@ -3,10 +3,12 @@ TARGET?=mcxa SIGN?=ECC256 HASH?=SHA256 MCUXSDK?=1 -MCUXPRESSO?=$(PWD)/../NXP/mcux-sdk +#MCUXPRESSO?=$(PWD)/../NXP/mcux-sdk +MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=MCXA153VLH -MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MCXA153 +MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MCX/MCXA/MCXA153 +MCUXPRESSO_PROJECT_TEMPLATE?=$(MCUXPRESSO)/examples/_boards/frdmmcxa153/project_template DEBUG?=0 VTOR?=1 CORTEX_M0?=0 diff --git a/config/examples/mcxw-tz.config b/config/examples/mcxw-tz.config index 1c90e39fe5..491d59fa35 100644 --- a/config/examples/mcxw-tz.config +++ b/config/examples/mcxw-tz.config @@ -4,10 +4,11 @@ TARGET?=mcxw SIGN?=ECC256 HASH?=SHA256 MCUXSDK?=1 -MCUXPRESSO?=$(PWD)/../NXP/mcux-sdk +MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=MCXW716CMFTA -MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MCXW716C +MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MCX/MCXW/MCXW716C +MCUXPRESSO_PROJECT_TEMPLATE?=$(MCUXPRESSO)/examples/_boards/frdmmcxw71/project_template DEBUG?=0 VTOR?=1 CORTEX_M0?=0 diff --git a/config/examples/mcxw.config b/config/examples/mcxw.config index 35d10e4eee..77e900b06f 100644 --- a/config/examples/mcxw.config +++ b/config/examples/mcxw.config @@ -3,10 +3,11 @@ TARGET?=mcxw SIGN?=ECC256 HASH?=SHA256 MCUXSDK?=1 -MCUXPRESSO?=$(PWD)/../NXP/mcux-sdk +MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=MCXW716CMFTA -MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MCXW716C +MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MCX/MCXW/MCXW716C +MCUXPRESSO_PROJECT_TEMPLATE?=$(MCUXPRESSO)/examples/_boards/frdmmcxw71/project_template DEBUG?=0 VTOR?=1 CORTEX_M0?=0 diff --git a/docs/Targets.md b/docs/Targets.md index bfcc448b09..7b72be4e3b 100644 --- a/docs/Targets.md +++ b/docs/Targets.md @@ -3220,8 +3220,27 @@ thread break: Stopped, 0x0, 0x0, cpuPowerPCBig, Connected (state, tid, pid, cpu NXP MCXA153 is a Cortex-M33 microcontroller running at 96MHz. The support has been tested using FRDM-MCXA153 with the onboard MCU-Link configured in JLink mode. -This requires the MCXA SDK from the NXP MCUXpresso SDK Builder. We tested using `SDK_2.14.2_MCXA153` and placed into `../NXP/MCXA153` by default (see .config or set with `MCUXPRESSO`). -MCUXpresso SDK Builder +This requires the [NXP MCUXpresso SDK](https://github.com/nxp-mcuxpresso/mcuxsdk-manifests), +placed into `../NXP/mcuxpresso-sdk` by default (see .config or set with +`MCUXPRESSO`). + +To set up the MCUXpresso SDK: + +``` +cd ../NXP + +# Install west +python -m venv west-venv +source west-venv/bin/activate +pip install west + +# Set up the repository +west init -m https://github.com/nxp-mcuxpresso/mcuxsdk-manifests.git mcuxpresso-sdk +cd mcuxpresso-sdk +west update_board --set board frdmmcxa153 + +deactivate +``` ### MCX A: Configuring and compiling @@ -3307,8 +3326,28 @@ c NXP MCXW716 is a Cortex-M33 microcontroller running at 96MHz. The support has been tested using FRDM-MCXW716 with the onboard MCU-Link configured in JLink mode. -This requires the MCXW SDK from the NXP MCUXpresso SDK Builder. We tested using [mcux-sdk](https://github.com/nxp-mcuxpresso/mcux-sdk) and [CMSIS_5](https://github.com/nxp-mcuxpresso/CMSIS_5) -placed under "../NXP". Adjust the MCUXPRESSO and MCUXPRESSO_CMSIS variables in your .config file according to your paths. +This requires the NXP MCUXpresso SDK. We tested using [mcuxsdk-manifests](https://github.com/nxp-mcuxpresso/mcuxsdk-manifests) +and [CMSIS_5](https://github.com/nxp-mcuxpresso/CMSIS_5) placed under "../NXP". +Adjust the MCUXPRESSO and MCUXPRESSO_CMSIS variables in your .config file +according to your paths. + +To set up the MCUXpresso SDK: + +``` +cd ../NXP + +# Install west +python -m venv west-venv +source west-venv/bin/activate +pip install west + +# Set up the repository +west init -m https://github.com/nxp-mcuxpresso/mcuxsdk-manifests.git mcuxpresso-sdk +cd mcuxpresso-sdk +west update_board --set board frdmmcxw71 + +deactivate +``` ### MCX W: Configuring and compiling diff --git a/test-app/Makefile b/test-app/Makefile index f1e34adafa..bc3637317c 100644 --- a/test-app/Makefile +++ b/test-app/Makefile @@ -351,7 +351,7 @@ endif ifeq ($(TARGET),mcxa) LSCRIPT_TEMPLATE=ARM-mcxa.ld - APP_OBJS+=$(MCUXPRESSO_DRIVERS)/project_template/clock_config.o + APP_OBJS+=$(MCUXPRESSO_PROJECT_TEMPLATE)/clock_config.o APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_reset.o APP_OBJS+=$(MCUXPRESSO)/drivers/gpio/fsl_gpio.o @@ -378,9 +378,9 @@ ifeq ($(TARGET),mcxw) APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_clock.o APP_OBJS+=$(MCUXPRESSO)/drivers/gpio/fsl_gpio.o APP_OBJS+=$(MCUXPRESSO)/drivers/spc/fsl_spc.o - APP_OBJS+=$(MCUXPRESSO_DRIVERS)/project_template/clock_config.o + APP_OBJS+=$(MCUXPRESSO_PROJECT_TEMPLATE)/clock_config.o APP_OBJS+=$(MCUXPRESSO)/drivers/ccm32k/fsl_ccm32k.o - APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/fsl_romapi.o + APP_OBJS+=$(MCUXPRESSO_DRIVERS)/drivers/romapi/fsl_romapi.o LDFLAGS+=--specs=nosys.specs endif From 233abfe9799142845248eefc6e3e5394ea8a78a7 Mon Sep 17 00:00:00 2001 From: Mattia Moffa Date: Thu, 29 Jan 2026 17:55:33 +0100 Subject: [PATCH 2/6] Fix LPC54 github workflow --- .github/workflows/test-configs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-configs.yml b/.github/workflows/test-configs.yml index f0eaa45aea..0875d261aa 100644 --- a/.github/workflows/test-configs.yml +++ b/.github/workflows/test-configs.yml @@ -125,10 +125,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 From fed7eec0adce9f97d966644c005e31779ed7cf60 Mon Sep 17 00:00:00 2001 From: Mattia Moffa Date: Thu, 29 Jan 2026 23:27:07 +0100 Subject: [PATCH 3/6] Update MCUXpresso SDK for iMX-RT too --- .github/workflows/test-configs.yml | 33 +++++++++----- arch.mk | 62 +++++++++++++++++++++++---- config/examples/imx-rt1040.config | 8 ++-- config/examples/imx-rt1050.config | 8 ++-- config/examples/imx-rt1060.config | 8 ++-- config/examples/imx-rt1060_hab.config | 8 ++-- config/examples/imx-rt1064.config | 8 ++-- docs/Targets.md | 6 +-- hal/imx_rt.c | 4 +- test-app/Makefile | 49 +++++++++++++++------ 10 files changed, 138 insertions(+), 56 deletions(-) diff --git a/.github/workflows/test-configs.yml b/.github/workflows/test-configs.yml index 0875d261aa..b602e33d4c 100644 --- a/.github/workflows/test-configs.yml +++ b/.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 diff --git a/arch.mk b/arch.mk index f74df0f222..fb34653813 100644 --- a/arch.mk +++ b/arch.mk @@ -821,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 \ @@ -851,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) diff --git a/config/examples/imx-rt1040.config b/config/examples/imx-rt1040.config index a7ff8848d8..7aafeee1d7 100644 --- a/config/examples/imx-rt1040.config +++ b/config/examples/imx-rt1040.config @@ -2,11 +2,11 @@ ARCH?=ARM TARGET?=imx_rt SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=0 -MCUXPRESSO?=$(PWD)/../SDK_2_14_0_EVKB-IMXRT1040 -MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS +MCUXSDK?=1 +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 diff --git a/config/examples/imx-rt1050.config b/config/examples/imx-rt1050.config index 3c55d6c9b1..f81fdbd9f7 100644 --- a/config/examples/imx-rt1050.config +++ b/config/examples/imx-rt1050.config @@ -2,11 +2,11 @@ ARCH?=ARM TARGET?=imx_rt SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=0 -MCUXPRESSO?=$(PWD)/../SDK_2_14_0_EVKB-IMXRT1050 -MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS +MCUXSDK?=1 +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 diff --git a/config/examples/imx-rt1060.config b/config/examples/imx-rt1060.config index 9a16cf5e85..87ded6441b 100644 --- a/config/examples/imx-rt1060.config +++ b/config/examples/imx-rt1060.config @@ -2,11 +2,11 @@ ARCH?=ARM TARGET?=imx_rt SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=0 -MCUXPRESSO?=$(PWD)/../SDK-2.11.0_EVK-MIMXRT1060 -MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS +MCUXSDK?=1 +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 diff --git a/config/examples/imx-rt1060_hab.config b/config/examples/imx-rt1060_hab.config index b94e5d05b3..068b12fa9d 100644 --- a/config/examples/imx-rt1060_hab.config +++ b/config/examples/imx-rt1060_hab.config @@ -3,11 +3,11 @@ TARGET?=imx_rt TARGET_IMX_HAB?=1 SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=0 -MCUXPRESSO?=$(PWD)/../SDK-2.11.0_EVK-MIMXRT1060 -MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS +MCUXSDK?=1 +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 diff --git a/config/examples/imx-rt1064.config b/config/examples/imx-rt1064.config index b3787b330e..1b0548604c 100644 --- a/config/examples/imx-rt1064.config +++ b/config/examples/imx-rt1064.config @@ -2,11 +2,11 @@ ARCH?=ARM TARGET?=imx_rt SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=0 -MCUXPRESSO?=$(PWD)/../SDK-2.11.0_EVK-MIMXRT1060 -MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS +MCUXSDK?=1 +MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk +MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=MIMXRT1064DVL6A -MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1064 +MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1064/MIMXRT1064 DEBUG?=0 VTOR?=1 CORTEX_M0?=0 diff --git a/docs/Targets.md b/docs/Targets.md index 7b72be4e3b..798132f84c 100644 --- a/docs/Targets.md +++ b/docs/Targets.md @@ -2683,15 +2683,15 @@ wolfBoot support for iMX-RT1060/iMX-RT1050 has been tested using MCUXpresso SDK DCP support (hardware acceleration for SHA256 operations) can be enabled by using PKA=1 in the configuration file. You can also get the SDK and CMSIS bundles using these repositories: -* https://github.com/nxp-mcuxpresso/mcux-sdk +* https://github.com/nxp-mcuxpresso/mcuxsdk-manifests * https://github.com/nxp-mcuxpresso/CMSIS_5 Use MCUXSDK=1 with this option, since the pack paths are different. Example: ``` MCUXSDK?=1 -MCUXPRESSO?=$(PWD)/../mcux-sdk -MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1062 +MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk +MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1060/MIMXRT1062 MCUXPRESSO_CMSIS?="$(PWD)/../CMSIS_5/CMSIS" ``` diff --git a/hal/imx_rt.c b/hal/imx_rt.c index 6ccdae702b..f1eca55459 100644 --- a/hal/imx_rt.c +++ b/hal/imx_rt.c @@ -40,7 +40,7 @@ #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 @@ -48,7 +48,7 @@ #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 diff --git a/test-app/Makefile b/test-app/Makefile index bc3637317c..a577f9a906 100644 --- a/test-app/Makefile +++ b/test-app/Makefile @@ -425,9 +425,9 @@ ifeq ($(TARGET),imx_rt) $(MCUXPRESSO)/drivers/common/fsl_common.o \ $(MCUXPRESSO)/drivers/common/fsl_common_arm.o \ $(MCUXPRESSO)/drivers/flexspi/fsl_flexspi.o \ - $(MCUXPRESSO)/utilities/str/fsl_str.o \ $(MCUXPRESSO)/drivers/lpuart/fsl_lpuart.o \ - $(MCUXPRESSO)/utilities/debug_console/fsl_debug_console.o + $(MCUXPRESSO)/components/str/fsl_str.o \ + $(MCUXPRESSO)/components/debug_console/fsl_debug_console.o else APP_OBJS+=\ $(MCUXPRESSO_DRIVERS)/drivers/fsl_gpio.o \ @@ -441,27 +441,52 @@ ifeq ($(TARGET),imx_rt) endif ifeq ($(MCUXPRESSO_CPU),MIMXRT1042XJM5B) - CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \ - -I$(MCUXPRESSO)/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_DRIVERS)/project_template/ \ - -I$(MCUXPRESSO)/boards/evkmimxrt1050/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_DRIVERS)/project_template/ \ - -I$(MCUXPRESSO)/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_DRIVERS)/project_template/ \ - -I$(MCUXPRESSO)/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_DRIVERS)/project_template/ \ - -I$(MCUXPRESSO)/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 From 9823c55221275485d4aa812bc98e15c3b52f6c32 Mon Sep 17 00:00:00 2001 From: Mattia Moffa Date: Fri, 30 Jan 2026 01:08:55 +0100 Subject: [PATCH 4/6] Restore Kinetis GitHub Workflows --- .github/workflows/test-configs.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-configs.yml b/.github/workflows/test-configs.yml index b602e33d4c..1d61644af1 100644 --- a/.github/workflows/test-configs.yml +++ b/.github/workflows/test-configs.yml @@ -109,18 +109,16 @@ jobs: board-name: evkbmimxrt1060 kinetis_k64f_test: - uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml + uses: ./.github/workflows/test-build-mcux-sdk.yml with: arch: arm config-file: ./config/examples/kinetis-k64f.config - board-name: frdmk64f kinetis_k82f_test: - uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml + uses: ./.github/workflows/test-build-mcux-sdk.yml with: arch: arm config-file: ./config/examples/kinetis-k82f.config - board-name: frdmk82f library_test: uses: ./.github/workflows/test-build.yml From 20bb90a44da8d49a67133352f5feca66a661df2c Mon Sep 17 00:00:00 2001 From: Mattia Moffa Date: Fri, 30 Jan 2026 01:23:37 +0100 Subject: [PATCH 5/6] Switch MCUXSDK back to 0 in iMX-RT Users can switch it to 1 if they want to use the SDK from GitHub, as is currently specified in the docs. --- config/examples/imx-rt1040.config | 2 +- config/examples/imx-rt1050.config | 2 +- config/examples/imx-rt1060.config | 2 +- config/examples/imx-rt1060_hab.config | 2 +- config/examples/imx-rt1064.config | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/examples/imx-rt1040.config b/config/examples/imx-rt1040.config index 7aafeee1d7..7855acc624 100644 --- a/config/examples/imx-rt1040.config +++ b/config/examples/imx-rt1040.config @@ -2,7 +2,7 @@ ARCH?=ARM TARGET?=imx_rt SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=1 +MCUXSDK?=0 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=MIMXRT1042XJM5B diff --git a/config/examples/imx-rt1050.config b/config/examples/imx-rt1050.config index f81fdbd9f7..c3782de20e 100644 --- a/config/examples/imx-rt1050.config +++ b/config/examples/imx-rt1050.config @@ -2,7 +2,7 @@ ARCH?=ARM TARGET?=imx_rt SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=1 +MCUXSDK?=0 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=MIMXRT1052DVJ6B diff --git a/config/examples/imx-rt1060.config b/config/examples/imx-rt1060.config index 87ded6441b..0dacfa11ac 100644 --- a/config/examples/imx-rt1060.config +++ b/config/examples/imx-rt1060.config @@ -2,7 +2,7 @@ ARCH?=ARM TARGET?=imx_rt SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=1 +MCUXSDK?=0 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=MIMXRT1062DVL6A diff --git a/config/examples/imx-rt1060_hab.config b/config/examples/imx-rt1060_hab.config index 068b12fa9d..bce74008e5 100644 --- a/config/examples/imx-rt1060_hab.config +++ b/config/examples/imx-rt1060_hab.config @@ -3,7 +3,7 @@ TARGET?=imx_rt TARGET_IMX_HAB?=1 SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=1 +MCUXSDK?=0 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=MIMXRT1062DVL6A diff --git a/config/examples/imx-rt1064.config b/config/examples/imx-rt1064.config index 1b0548604c..ae2853fbbb 100644 --- a/config/examples/imx-rt1064.config +++ b/config/examples/imx-rt1064.config @@ -2,7 +2,7 @@ ARCH?=ARM TARGET?=imx_rt SIGN?=ECC256 HASH?=SHA256 -MCUXSDK?=1 +MCUXSDK?=0 MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS MCUXPRESSO_CPU?=MIMXRT1064DVL6A From e2a74ba09d4f855bbb8702551fd839fbcea832d5 Mon Sep 17 00:00:00 2001 From: Mattia Moffa Date: Fri, 30 Jan 2026 01:59:15 +0100 Subject: [PATCH 6/6] Replace non-existing boards --- .github/workflows/test-configs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-configs.yml b/.github/workflows/test-configs.yml index 1d61644af1..a84cde0ccc 100644 --- a/.github/workflows/test-configs.yml +++ b/.github/workflows/test-configs.yml @@ -46,14 +46,14 @@ jobs: with: arch: arm config-file: ./config/examples/imx-rt1040.config - board-name: evkmimxrt1040 + board-name: evkbmimxrt1060 imx_rt1050_test: uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml with: arch: arm config-file: ./config/examples/imx-rt1050.config - board-name: evkbimxrt1050 + board-name: evkbmimxrt1060 imx_rt1060_test: uses: ./.github/workflows/test-build-mcux-sdk-manifests.yml @@ -74,7 +74,7 @@ jobs: with: arch: arm config-file: ./config/examples/imx-rt1040.config - board-name: evkmimxrt1040 + board-name: evkbmimxrt1060 make-args: PKA=1 NO_ARM_ASM=1 imx_rt1050_test_pka: @@ -82,7 +82,7 @@ jobs: with: arch: arm config-file: ./config/examples/imx-rt1050.config - board-name: evkbimxrt1050 + board-name: evkbmimxrt1060 make-args: PKA=1 NO_ARM_ASM=1 imx_rt1060_test_pka: