Skip to content

Commit ad39833

Browse files
committed
fix build with nxp since mcux-sdk from 2.13.0 remove CMSIS folder
1 parent 908e23d commit ad39833

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

hw/bsp/imxrt/family.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
UF2_FAMILY_ID = 0x4fb2d5bd
22
SDK_DIR = hw/mcu/nxp/mcux-sdk
3-
DEPS_SUBMODULES += $(SDK_DIR)
3+
DEPS_SUBMODULES += $(SDK_DIR) lib/CMSIS_5
44

55
include $(TOP)/$(BOARD_PATH)/board.mk
66

@@ -48,7 +48,7 @@ SRC_C += \
4848

4949
INC += \
5050
$(TOP)/$(BOARD_PATH) \
51-
$(TOP)/$(MCU_DIR)/../../CMSIS/Include \
51+
$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
5252
$(TOP)/$(MCU_DIR) \
5353
$(TOP)/$(MCU_DIR)/project_template \
5454
$(TOP)/$(MCU_DIR)/drivers \

hw/bsp/kinetis_k32/family.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SDK_DIR = hw/mcu/nxp/mcux-sdk
2-
DEPS_SUBMODULES += $(SDK_DIR)
2+
DEPS_SUBMODULES += $(SDK_DIR) lib/CMSIS_5
33

44
MCU_DIR = $(SDK_DIR)/devices/$(MCU)
55
include $(TOP)/$(BOARD_PATH)/board.mk
@@ -19,7 +19,7 @@ SRC_C += \
1919

2020
INC += \
2121
$(TOP)/$(BOARD_PATH) \
22-
$(TOP)/$(SDK_DIR)/CMSIS/Include \
22+
$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
2323
$(TOP)/$(MCU_DIR) \
2424
$(TOP)/$(MCU_DIR)/project_template \
2525
$(TOP)/$(MCU_DIR)/drivers \

hw/bsp/lpc51/family.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SDK_DIR = hw/mcu/nxp/mcux-sdk
2-
DEPS_SUBMODULES += $(SDK_DIR)
2+
DEPS_SUBMODULES += $(SDK_DIR) lib/CMSIS_5
33

44
MCU_DIR = $(SDK_DIR)/devices/$(MCU)
55
include $(TOP)/$(BOARD_PATH)/board.mk
@@ -29,7 +29,7 @@ SRC_C += \
2929
$(SDK_DIR)/drivers/flexcomm/fsl_usart.c
3030

3131
INC += \
32-
$(TOP)/$(MCU_DIR)/../../CMSIS/Include \
32+
$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
3333
$(TOP)/$(MCU_DIR) \
3434
$(TOP)/$(MCU_DIR)/drivers \
3535
$(TOP)/$(SDK_DIR)/drivers/common \

hw/bsp/lpc54/family.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SDK_DIR = hw/mcu/nxp/mcux-sdk
2-
DEPS_SUBMODULES += $(SDK_DIR)
2+
DEPS_SUBMODULES += $(SDK_DIR) lib/CMSIS_5
33

44
include $(TOP)/$(BOARD_PATH)/board.mk
55

@@ -40,7 +40,7 @@ SRC_C += \
4040

4141
INC += \
4242
$(TOP)/$(BOARD_PATH) \
43-
$(TOP)/$(MCU_DIR)/../../CMSIS/Include \
43+
$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
4444
$(TOP)/$(MCU_DIR) \
4545
$(TOP)/$(MCU_DIR)/drivers \
4646
$(TOP)/$(SDK_DIR)/drivers/common \

hw/bsp/lpc55/family.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
UF2_FAMILY_ID = 0x2abc77ec
22
SDK_DIR = hw/mcu/nxp/mcux-sdk
3-
DEPS_SUBMODULES += lib/sct_neopixel $(SDK_DIR)
3+
DEPS_SUBMODULES += lib/CMSIS_5 lib/sct_neopixel $(SDK_DIR)
44

55
include $(TOP)/$(BOARD_PATH)/board.mk
66

@@ -51,7 +51,7 @@ SRC_C += \
5151
INC += \
5252
$(TOP)/$(BOARD_PATH) \
5353
$(TOP)/lib/sct_neopixel \
54-
$(TOP)/$(MCU_DIR)/../../CMSIS/Include \
54+
$(TOP)/lib/CMSIS_5/CMSIS/Core/Include \
5555
$(TOP)/$(MCU_DIR) \
5656
$(TOP)/$(MCU_DIR)/drivers \
5757
$(TOP)/$(SDK_DIR)/drivers/common \

0 commit comments

Comments
 (0)