From cf64b2214b9ac3cd6815af6ddc48b1cd0f075590 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 29 Apr 2021 00:22:28 +0700
Subject: [PATCH] fix build with mkl25z

---
 .gitmodules                | 3 +++
 hw/bsp/frdm_kl25z/board.mk | 7 ++++---
 hw/mcu/nxp/nxp_sdk         | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 160000 hw/mcu/nxp/nxp_sdk

diff --git a/.gitmodules b/.gitmodules
index f9edcebd..79ef8e0a 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 2e973b98..cec722f8 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
index 00000000..b4e85c43
--- /dev/null
+++ b/hw/mcu/nxp/nxp_sdk
@@ -0,0 +1 @@
+Subproject commit b4e85c4353af401dbf5a0a17be673530248fca23