Skip to content

Commit 69eda18

Browse files
mattia-moffamattia-moffa
committed
Broken
1 parent 233abfe commit 69eda18

8 files changed

Lines changed: 147 additions & 53 deletions

File tree

‎arch.mk‎

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,16 @@ ifeq ($(TARGET),nrf5340_net)
797797
endif
798798

799799
ifeq ($(TARGET),imx_rt)
800+
MCUXPRESSO_NEW_LAYOUT:=0
801+
ifneq ($(wildcard $(MCUXPRESSO)/components/debug_console/fsl_debug_console.h),)
802+
MCUXPRESSO_NEW_LAYOUT:=1
803+
endif
804+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
805+
MCUXPRESSO_BOARD_DIR:=$(MCUXPRESSO)/examples/_boards
806+
else
807+
MCUXPRESSO_BOARD_DIR:=$(MCUXPRESSO)/boards
808+
endif
809+
800810
CFLAGS+=\
801811
-I$(MCUXPRESSO_DRIVERS) \
802812
-I$(MCUXPRESSO_DRIVERS)/drivers \
@@ -813,6 +823,13 @@ ifeq ($(TARGET),imx_rt)
813823
-I$(MCUXPRESSO_DRIVERS)/project_template \
814824
-I$(MCUXPRESSO_CMSIS)/Include \
815825
-I$(MCUXPRESSO_CMSIS)/Core/Include
826+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
827+
CFLAGS+=\
828+
-I$(MCUXPRESSO)/components/debug_console \
829+
-I$(MCUXPRESSO)/components/debug_console/config \
830+
-I$(MCUXPRESSO)/components/lists \
831+
-I$(MCUXPRESSO)/components/str
832+
endif
816833
CFLAGS+=\
817834
-DCPU_$(MCUXPRESSO_CPU) \
818835
-DDEBUG_CONSOLE_ASSERT_DISABLE=1 \
@@ -851,32 +868,60 @@ ifeq ($(TARGET),imx_rt)
851868

852869
ifeq ($(MCUXPRESSO_CPU),MIMXRT1064DVL6A)
853870
ARCH_FLASH_OFFSET=0x70000000
854-
CFLAGS+=-I$(MCUXPRESSO)/boards/evkmimxrt1064/xip/
871+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1064/xip/
872+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
873+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1064
874+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1064/project_template
875+
endif
855876
endif
856877

857878
ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6A)
858879
ARCH_FLASH_OFFSET=0x60000000
859-
CFLAGS+=-I$(MCUXPRESSO)/boards/evkmimxrt1060/xip/
880+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1060/xip/
881+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
882+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1060
883+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1060/project_template
884+
CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
885+
endif
860886
endif
861887

862888
ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6B)
863889
ARCH_FLASH_OFFSET=0x60000000
864-
CFLAGS+=-I$(MCUXPRESSO)/boards/evkbmimxrt1060/xip/
890+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkbmimxrt1060/xip/
891+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
892+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkbmimxrt1060
893+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkbmimxrt1060/project_template
894+
CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
895+
endif
865896
endif
866897

867898
ifeq ($(MCUXPRESSO_CPU),MIMXRT1061CVJ5B)
868899
ARCH_FLASH_OFFSET=0x60000000
869-
CFLAGS+=-I$(MCUXPRESSO)/boards/evkmimxrt1060/xip/
900+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1060/xip/
901+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
902+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1060
903+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1060/project_template
904+
CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
905+
endif
870906
endif
871907

872908
ifeq ($(MCUXPRESSO_CPU),MIMXRT1052DVJ6B)
873909
ARCH_FLASH_OFFSET=0x60000000
874-
CFLAGS+=-I$(MCUXPRESSO)/boards/evkbimxrt1050/xip/
910+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkbimxrt1050/xip/
911+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
912+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkbimxrt1050
913+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkbimxrt1050/project_template
914+
endif
875915
endif
876916

877917
ifeq ($(MCUXPRESSO_CPU),MIMXRT1042XJM5B)
878918
ARCH_FLASH_OFFSET=0x60000000
879-
CFLAGS+=-I$(MCUXPRESSO)/boards/evkmimxrt1040/xip/
919+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1040/xip/
920+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
921+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1040
922+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1040/project_template
923+
CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
924+
endif
880925
endif
881926

882927
ifeq ($(PKA),1)

‎config/examples/imx-rt1040.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ TARGET?=imx_rt
33
SIGN?=ECC256
44
HASH?=SHA256
55
MCUXSDK?=0
6-
MCUXPRESSO?=$(PWD)/../SDK_2_14_0_EVKB-IMXRT1040
7-
MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
6+
MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
7+
MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
88
MCUXPRESSO_CPU?=MIMXRT1042XJM5B
9-
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1042
9+
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1040/MIMXRT1042
1010
DEBUG?=0
1111
VTOR?=1
1212
CORTEX_M0?=0

‎config/examples/imx-rt1050.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ TARGET?=imx_rt
33
SIGN?=ECC256
44
HASH?=SHA256
55
MCUXSDK?=0
6-
MCUXPRESSO?=$(PWD)/../SDK_2_14_0_EVKB-IMXRT1050
7-
MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
6+
MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
7+
MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
88
MCUXPRESSO_CPU?=MIMXRT1052DVJ6B
9-
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1052
9+
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
1010
DEBUG?=0
1111
VTOR?=1
1212
CORTEX_M0?=0

‎config/examples/imx-rt1060.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ TARGET?=imx_rt
33
SIGN?=ECC256
44
HASH?=SHA256
55
MCUXSDK?=0
6-
MCUXPRESSO?=$(PWD)/../SDK-2.11.0_EVK-MIMXRT1060
7-
MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
6+
MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
7+
MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
88
MCUXPRESSO_CPU?=MIMXRT1062DVL6A
9-
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1062
9+
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1060/MIMXRT1062
1010
DEBUG?=0
1111
VTOR?=1
1212
CORTEX_M0?=0

‎config/examples/imx-rt1060_hab.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ TARGET_IMX_HAB?=1
44
SIGN?=ECC256
55
HASH?=SHA256
66
MCUXSDK?=0
7-
MCUXPRESSO?=$(PWD)/../SDK-2.11.0_EVK-MIMXRT1060
8-
MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
7+
MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
8+
MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
99
MCUXPRESSO_CPU?=MIMXRT1062DVL6A
10-
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1062
10+
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1060/MIMXRT1062
1111
DEBUG?=0
1212
VTOR?=1
1313
CORTEX_M0?=0

‎config/examples/imx-rt1064.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ TARGET?=imx_rt
33
SIGN?=ECC256
44
HASH?=SHA256
55
MCUXSDK?=0
6-
MCUXPRESSO?=$(PWD)/../SDK-2.11.0_EVK-MIMXRT1060
7-
MCUXPRESSO_CMSIS?=$(MCUXPRESSO)/CMSIS
6+
MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
7+
MCUXPRESSO_CMSIS?=$(PWD)/../NXP/CMSIS_5/CMSIS
88
MCUXPRESSO_CPU?=MIMXRT1064DVL6A
9-
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1064
9+
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1060/MIMXRT1064
1010
DEBUG?=0
1111
VTOR?=1
1212
CORTEX_M0?=0

‎docs/Targets.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2683,15 +2683,15 @@ wolfBoot support for iMX-RT1060/iMX-RT1050 has been tested using MCUXpresso SDK
26832683
DCP support (hardware acceleration for SHA256 operations) can be enabled by using PKA=1 in the configuration file.
26842684

26852685
You can also get the SDK and CMSIS bundles using these repositories:
2686-
* https://github.com/nxp-mcuxpresso/mcux-sdk
2686+
* https://github.com/nxp-mcuxpresso/mcuxsdk-manifests
26872687
* https://github.com/nxp-mcuxpresso/CMSIS_5
26882688
Use MCUXSDK=1 with this option, since the pack paths are different.
26892689

26902690
Example:
26912691
```
26922692
MCUXSDK?=1
2693-
MCUXPRESSO?=$(PWD)/../mcux-sdk
2694-
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MIMXRT1062
2693+
MCUXPRESSO?=$(PWD)/../NXP/mcuxpresso-sdk/mcuxsdk
2694+
MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/RT/RT1060/MIMXRT1062
26952695
MCUXPRESSO_CMSIS?="$(PWD)/../CMSIS_5/CMSIS"
26962696
```
26972697

‎test-app/Makefile‎

Lines changed: 78 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -418,50 +418,99 @@ ifeq ($(TARGET),imx_rt)
418418
$(MCUXPRESSO)/components/lists/fsl_component_generic_list.o \
419419
$(MCUXPRESSO)/components/serial_manager/fsl_component_serial_port_uart.o \
420420
$(MCUXPRESSO)/components/flash/nor/flexspi/fsl_flexspi_nor_flash.o
421-
ifeq ($(MCUXSDK),1)
422-
APP_OBJS+=\
423-
$(MCUXPRESSO)/drivers/igpio/fsl_gpio.o \
424-
$(MCUXPRESSO)/drivers/cache/armv7-m7/fsl_cache.o \
425-
$(MCUXPRESSO)/drivers/common/fsl_common.o \
426-
$(MCUXPRESSO)/drivers/common/fsl_common_arm.o \
427-
$(MCUXPRESSO)/drivers/flexspi/fsl_flexspi.o \
428-
$(MCUXPRESSO)/utilities/str/fsl_str.o \
429-
$(MCUXPRESSO)/drivers/lpuart/fsl_lpuart.o \
430-
$(MCUXPRESSO)/utilities/debug_console/fsl_debug_console.o
421+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
422+
ifeq ($(MCUXSDK),1)
423+
APP_OBJS+=\
424+
$(MCUXPRESSO)/drivers/igpio/fsl_gpio.o \
425+
$(MCUXPRESSO)/drivers/cache/armv7-m7/fsl_cache.o \
426+
$(MCUXPRESSO)/drivers/common/fsl_common.o \
427+
$(MCUXPRESSO)/drivers/common/fsl_common_arm.o \
428+
$(MCUXPRESSO)/drivers/flexspi/fsl_flexspi.o \
429+
$(MCUXPRESSO)/drivers/lpuart/fsl_lpuart.o \
430+
$(MCUXPRESSO)/components/str/fsl_str.o \
431+
$(MCUXPRESSO)/components/debug_console/fsl_debug_console.o
432+
else
433+
APP_OBJS+=\
434+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_gpio.o \
435+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_cache.o \
436+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_common.o \
437+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_common_arm.o \
438+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_flexspi.o \
439+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_lpuart.o \
440+
$(MCUXPRESSO)/components/str/fsl_str.o \
441+
$(MCUXPRESSO)/components/debug_console/fsl_debug_console.o
442+
endif
431443
else
432-
APP_OBJS+=\
433-
$(MCUXPRESSO_DRIVERS)/drivers/fsl_gpio.o \
434-
$(MCUXPRESSO_DRIVERS)/drivers/fsl_cache.o \
435-
$(MCUXPRESSO_DRIVERS)/drivers/fsl_common.o \
436-
$(MCUXPRESSO_DRIVERS)/drivers/fsl_common_arm.o \
437-
$(MCUXPRESSO_DRIVERS)/drivers/fsl_flexspi.o \
438-
$(MCUXPRESSO_DRIVERS)/utilities/str/fsl_str.o \
439-
$(MCUXPRESSO_DRIVERS)/drivers/fsl_lpuart.o \
440-
$(MCUXPRESSO_DRIVERS)/utilities/debug_console/fsl_debug_console.o
444+
ifeq ($(MCUXSDK),1)
445+
APP_OBJS+=\
446+
$(MCUXPRESSO)/drivers/igpio/fsl_gpio.o \
447+
$(MCUXPRESSO)/drivers/cache/armv7-m7/fsl_cache.o \
448+
$(MCUXPRESSO)/drivers/common/fsl_common.o \
449+
$(MCUXPRESSO)/drivers/common/fsl_common_arm.o \
450+
$(MCUXPRESSO)/drivers/flexspi/fsl_flexspi.o \
451+
$(MCUXPRESSO)/utilities/str/fsl_str.o \
452+
$(MCUXPRESSO)/drivers/lpuart/fsl_lpuart.o \
453+
$(MCUXPRESSO)/utilities/debug_console/fsl_debug_console.o
454+
else
455+
APP_OBJS+=\
456+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_gpio.o \
457+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_cache.o \
458+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_common.o \
459+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_common_arm.o \
460+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_flexspi.o \
461+
$(MCUXPRESSO_DRIVERS)/utilities/str/fsl_str.o \
462+
$(MCUXPRESSO_DRIVERS)/drivers/fsl_lpuart.o \
463+
$(MCUXPRESSO_DRIVERS)/utilities/debug_console/fsl_debug_console.o
464+
endif
441465
endif
442466

443467
ifeq ($(MCUXPRESSO_CPU),MIMXRT1042XJM5B)
444-
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
445-
-I$(MCUXPRESSO)/boards/evkmimxrt1040/xip/
468+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
469+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1040/project_template \
470+
-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1040/xip/
471+
else
472+
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
473+
-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1040/xip/
474+
endif
446475
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1042.o
447476
else ifeq ($(MCUXPRESSO_CPU),MIMXRT1052DVJ6B)
448-
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
449-
-I$(MCUXPRESSO)/boards/evkmimxrt1050/xip/
477+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
478+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkbimxrt1050/project_template \
479+
-I$(MCUXPRESSO_BOARD_DIR)/evkbimxrt1050/xip/
480+
else
481+
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
482+
-I$(MCUXPRESSO_BOARD_DIR)/evkbimxrt1050/xip/
483+
endif
450484
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1052.o
451485
else
452486
ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6A)
453-
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
454-
-I$(MCUXPRESSO)/boards/evkmimxrt1060/xip/
487+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
488+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1060/project_template \
489+
-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1060/xip/
490+
else
491+
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
492+
-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1060/xip/
493+
endif
455494
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1062.o
456495
endif
457496
ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6B)
458-
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
459-
-I$(MCUXPRESSO)/boards/evkbmimxrt1060/xip/
497+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
498+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkbmimxrt1060/project_template \
499+
-I$(MCUXPRESSO_BOARD_DIR)/evkbmimxrt1060/xip/
500+
else
501+
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
502+
-I$(MCUXPRESSO_BOARD_DIR)/evkbmimxrt1060/xip/
503+
endif
460504
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1062.o
461505
endif
462506
ifeq ($(MCUXPRESSO_CPU),MIMXRT1064DVL6A)
463-
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
464-
-I$(MCUXPRESSO)/boards/evkmimxrt1064/xip/
507+
ifeq ($(MCUXPRESSO_NEW_LAYOUT),1)
508+
CFLAGS+=-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1064/project_template \
509+
-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1064/xip/
510+
else
511+
CFLAGS+=-I$(MCUXPRESSO_DRIVERS)/project_template/ \
512+
-I$(MCUXPRESSO_BOARD_DIR)/evkmimxrt1064/xip/
513+
endif
465514
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1064.o
466515
endif
467516
endif

0 commit comments

Comments
 (0)