summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2021-04-29 00:22:28 +0700
committerhathach <[email protected]>2021-04-29 00:22:28 +0700
commitcf64b2214b9ac3cd6815af6ddc48b1cd0f075590 (patch)
tree67b2be338ef0faf1f8c54a6d243655b164cc16d2
parentd70af332c02a7093fdd0636f6ceb14abd1f74004 (diff)
fix build with mkl25z
-rw-r--r--.gitmodules3
-rw-r--r--hw/bsp/frdm_kl25z/board.mk7
m---------hw/mcu/nxp/nxp_sdk0
3 files changed, 7 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index f9edcebd8..79ef8e0ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -118,3 +118,6 @@
[submodule "hw/mcu/nxp/mcux-sdk"]
path = hw/mcu/nxp/mcux-sdk
url = https://github.com/NXPmicro/mcux-sdk.git
+[submodule "hw/mcu/nxp/nxp_sdk"]
+ path = hw/mcu/nxp/nxp_sdk
+ url = https://github.com/hathach/nxp_sdk.git
diff --git a/hw/bsp/frdm_kl25z/board.mk b/hw/bsp/frdm_kl25z/board.mk
index 2e973b98d..cec722f85 100644
--- a/hw/bsp/frdm_kl25z/board.mk
+++ b/hw/bsp/frdm_kl25z/board.mk
@@ -1,4 +1,5 @@
-DEPS_SUBMODULES += hw/mcu/nxp/mcux-sdk
+SDK_DIR = hw/mcu/nxp/nxp_sdk
+DEPS_SUBMODULES += $(SDK_DIR)
CFLAGS += \
-mthumb \
@@ -10,7 +11,7 @@ CFLAGS += \
# mcu driver cause following warnings
CFLAGS += -Wno-error=unused-parameter
-MCU_DIR = hw/mcu/nxp/mcux-sdk/devices/MKL25Z4
+MCU_DIR = $(SDK_DIR)/devices/MKL25Z4
# All source paths should be relative to the top level.
LD_FILE = $(MCU_DIR)/gcc/MKL25Z128xxx4_flash.ld
@@ -25,7 +26,7 @@ SRC_C += \
INC += \
$(TOP)/hw/bsp/$(BOARD) \
- $(TOP)/$(MCU_DIR)/../../CMSIS/Include \
+ $(TOP)/hw/mcu/nxp/mcux-sdk/CMSIS/Include \
$(TOP)/$(MCU_DIR) \
$(TOP)/$(MCU_DIR)/drivers \
$(TOP)/$(MCU_DIR)/project_template \
diff --git a/hw/mcu/nxp/nxp_sdk b/hw/mcu/nxp/nxp_sdk
new file mode 160000
+Subproject b4e85c4353af401dbf5a0a17be673530248fca2