Browse Source

fix build with mkl25z

hathach 4 years ago
parent
commit
cf64b2214b
3 changed files with 8 additions and 3 deletions
  1. 3 0
      .gitmodules
  2. 4 3
      hw/bsp/frdm_kl25z/board.mk
  3. 1 0
      hw/mcu/nxp/nxp_sdk

+ 3 - 0
.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

+ 4 - 3
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 \

+ 1 - 0
hw/mcu/nxp/nxp_sdk

@@ -0,0 +1 @@
+Subproject commit b4e85c4353af401dbf5a0a17be673530248fca23