Skip to content

Commit 62f5b35

Browse files
mattia-moffamattia-moffa
committed
Still broken
1 parent 69eda18 commit 62f5b35

2 files changed

Lines changed: 57 additions & 129 deletions

File tree

‎arch.mk‎

Lines changed: 28 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -797,44 +797,33 @@ 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-
810800
CFLAGS+=\
811801
-I$(MCUXPRESSO_DRIVERS) \
812802
-I$(MCUXPRESSO_DRIVERS)/drivers \
803+
-I$(MCUXPRESSO_DRIVERS)/../periph \
813804
-I$(MCUXPRESSO)/drivers \
814805
-I$(MCUXPRESSO)/drivers/cache/armv7-m7 \
815806
-I$(MCUXPRESSO)/drivers/common \
816807
-I$(MCUXPRESSO)/drivers/flexspi \
817808
-I$(MCUXPRESSO)/drivers/lpuart \
818809
-I$(MCUXPRESSO)/drivers/igpio \
819810
-I$(MCUXPRESSO)/components/uart \
811+
-I$(MCUXPRESSO)/components/debug_console \
812+
-I$(MCUXPRESSO)/components/debug_console/config \
813+
-I$(MCUXPRESSO)/components/lists \
820814
-I$(MCUXPRESSO)/components/flash/nor \
821815
-I$(MCUXPRESSO)/components/flash/nor/flexspi \
822816
-I$(MCUXPRESSO)/components/serial_manager \
817+
-I$(MCUXPRESSO)/components/str \
823818
-I$(MCUXPRESSO_DRIVERS)/project_template \
824819
-I$(MCUXPRESSO_CMSIS)/Include \
825820
-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
833821
CFLAGS+=\
834822
-DCPU_$(MCUXPRESSO_CPU) \
835823
-DDEBUG_CONSOLE_ASSERT_DISABLE=1 \
836824
-DXIP_EXTERNAL_FLASH=1 -DDEBUG_CONSOLE_ASSERT_DISABLE=1 -DPRINTF_ADVANCED_ENABLE=1 \
837825
-DSCANF_ADVANCED_ENABLE=1 -DSERIAL_PORT_TYPE_UART=1 -DNDEBUG=1
826+
CFLAGS+=-DDCB=CoreDebug -DDCB_DEMCR_TRCENA_Msk=CoreDebug_DEMCR_TRCENA_Msk
838827

839828
ifeq ($(MCUXSDK),1)
840829
CFLAGS+=\
@@ -868,60 +857,48 @@ ifeq ($(TARGET),imx_rt)
868857

869858
ifeq ($(MCUXPRESSO_CPU),MIMXRT1064DVL6A)
870859
ARCH_FLASH_OFFSET=0x70000000
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
860+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/xip/
861+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064
862+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/project_template
876863
endif
877864

878865
ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6A)
879866
ARCH_FLASH_OFFSET=0x60000000
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
867+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
868+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060
869+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template
870+
CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
886871
endif
887872

888873
ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6B)
889874
ARCH_FLASH_OFFSET=0x60000000
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
875+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/xip/
876+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060
877+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/project_template
878+
CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
896879
endif
897880

898881
ifeq ($(MCUXPRESSO_CPU),MIMXRT1061CVJ5B)
899882
ARCH_FLASH_OFFSET=0x60000000
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
883+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
884+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060
885+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template
886+
CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
906887
endif
907888

908889
ifeq ($(MCUXPRESSO_CPU),MIMXRT1052DVJ6B)
909890
ARCH_FLASH_OFFSET=0x60000000
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
891+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/xip/
892+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050
893+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/project_template
915894
endif
916895

917896
ifeq ($(MCUXPRESSO_CPU),MIMXRT1042XJM5B)
918897
ARCH_FLASH_OFFSET=0x60000000
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
898+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/xip/
899+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040
900+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/project_template
901+
CFLAGS+=-I$(MCUXPRESSO)/devices/RT/RT1050/MIMXRT1052
925902
endif
926903

927904
ifeq ($(PKA),1)

‎test-app/Makefile‎

Lines changed: 29 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -418,99 +418,50 @@ 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 ($(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
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)/drivers/lpuart/fsl_lpuart.o \
429+
$(MCUXPRESSO)/components/str/fsl_str.o \
430+
$(MCUXPRESSO)/components/debug_console/fsl_debug_console.o
443431
else
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
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)/drivers/fsl_lpuart.o \
439+
$(MCUXPRESSO)/components/str/fsl_str.o \
440+
$(MCUXPRESSO)/components/debug_console/fsl_debug_console.o
465441
endif
466442

467443
ifeq ($(MCUXPRESSO_CPU),MIMXRT1042XJM5B)
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
444+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/project_template \
445+
-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1040/xip/
475446
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1042.o
476447
else ifeq ($(MCUXPRESSO_CPU),MIMXRT1052DVJ6B)
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
448+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/project_template \
449+
-I$(MCUXPRESSO)/examples/_boards/evkbimxrt1050/xip/
484450
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1052.o
485451
else
486452
ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6A)
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
453+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/project_template \
454+
-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1060/xip/
494455
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1062.o
495456
endif
496457
ifeq ($(MCUXPRESSO_CPU),MIMXRT1062DVL6B)
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
458+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/project_template \
459+
-I$(MCUXPRESSO)/examples/_boards/evkbmimxrt1060/xip/
504460
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1062.o
505461
endif
506462
ifeq ($(MCUXPRESSO_CPU),MIMXRT1064DVL6A)
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
463+
CFLAGS+=-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/project_template \
464+
-I$(MCUXPRESSO)/examples/_boards/evkmimxrt1064/xip/
514465
APP_OBJS+=$(MCUXPRESSO_DRIVERS)/system_MIMXRT1064.o
515466
endif
516467
endif

0 commit comments

Comments
 (0)