Jelajahi Sumber

Correct path for using the ft90x-sdk submodule (BRTSG-FOSS / ft90x-sdk). Default to ft90x-sdk instead of pre-built library.

Gordon McNab 4 tahun lalu
induk
melakukan
21fa7ea468
1 mengubah file dengan 5 tambahan dan 4 penghapusan
  1. 5 4
      hw/bsp/brtmm90x/family.mk

+ 5 - 4
hw/bsp/brtmm90x/family.mk

@@ -3,23 +3,24 @@ CROSS_COMPILE = ft32-elf-
 SKIP_NANOLIB = 1
 SKIP_NANOLIB = 1
 
 
 # Set to use FT90X prebuilt libraries.
 # Set to use FT90X prebuilt libraries.
-FT90X_PREBUILT_LIBS = 1
+FT90X_PREBUILT_LIBS = 0
 ifeq ($(FT90X_PREBUILT_LIBS),1)
 ifeq ($(FT90X_PREBUILT_LIBS),1)
 # If the FT90X toolchain is installed on Windows systems then the SDK 
 # If the FT90X toolchain is installed on Windows systems then the SDK 
 # include files and prebuilt libraries are at: %FT90X_TOOLCHAIN%/hardware
 # include files and prebuilt libraries are at: %FT90X_TOOLCHAIN%/hardware
 FT9XX_SDK = $(FT90X_TOOLCHAIN)/hardware
 FT9XX_SDK = $(FT90X_TOOLCHAIN)/hardware
+INC += $(FT9XX_SDK)/include
 else
 else
 # The submodule BRTSG-FOSS/ft90x-sdk contains header files and source
 # The submodule BRTSG-FOSS/ft90x-sdk contains header files and source
 # code for the Bridgetek SDK. This can be used instead of the prebuilt
 # code for the Bridgetek SDK. This can be used instead of the prebuilt
 # library.
 # library.
-DEPS_SUBMODULES += hw/mcu/bridgetek/ft9xx/hardware
+DEPS_SUBMODULES += hw/mcu/bridgetek/ft9xx/ft90x-sdk
 # The SDK can be used to load specific files from the Bridgetek SDK.
 # The SDK can be used to load specific files from the Bridgetek SDK.
-FT9XX_SDK = hw/mcu/bridgetek/ft9xx/hardware/Source
+FT9XX_SDK = hw/mcu/bridgetek/ft9xx/ft90x-sdk/Source
+INC += $(TOP)/$(FT9XX_SDK)/include
 endif
 endif
 
 
 # Add include files which are within the TinyUSB directory structure.
 # Add include files which are within the TinyUSB directory structure.
 INC += \
 INC += \
-	$(TOP)/hw/mcu/bridgetek/ft9xx/hardware/Source/include \
 	$(TOP)/$(BOARD_PATH)
 	$(TOP)/$(BOARD_PATH)
 
 
 # Add required C Compiler flags for FT90X.
 # Add required C Compiler flags for FT90X.