diff --git a/hw/bsp/frdm_kl25z/board.mk b/hw/bsp/frdm_kl25z/board.mk
index cec722f85..451bc37c2 100644
--- a/hw/bsp/frdm_kl25z/board.mk
+++ b/hw/bsp/frdm_kl25z/board.mk
@@ -26,7 +26,7 @@ SRC_C += \
 
 INC += \
 	$(TOP)/hw/bsp/$(BOARD) \
-	$(TOP)/hw/mcu/nxp/mcux-sdk/CMSIS/Include \
+	$(TOP)/$(SDK_DIR)/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
index b4e85c435..845c8fc49 160000
--- a/hw/mcu/nxp/nxp_sdk
+++ b/hw/mcu/nxp/nxp_sdk
@@ -1 +1 @@
-Subproject commit b4e85c4353af401dbf5a0a17be673530248fca23
+Subproject commit 845c8fc49b6fb660f06a5c45225494eacb06f00c