djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stmhal/Makefile: Use lib/stm32lib instead of local cmsis and hal files.

This commit is contained in:
Damien George 2017-08-27 22:36:39 +10:00
parent 904eb2d9f3
commit 05eba60d84
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stmhal/Makefile
View File

@ -22,8 +22,9 @@ FROZEN_MPY_DIR ?= modules
include $(TOP)/py/py.mk include $(TOP)/py/py.mk
LD_DIR=boards LD_DIR=boards
CMSIS_DIR=cmsis CMSIS_DIR=$(TOP)/lib/stm32lib/CMSIS/STM32$(MCU_SERIES_UPPER)xx/Include
HAL_DIR=hal/$(MCU_SERIES) MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
HAL_DIR=lib/stm32lib/STM32$(MCU_SERIES_UPPER)xx_HAL_Driver
USBDEV_DIR=usbdev USBDEV_DIR=usbdev
#USBHOST_DIR=usbhost #USBHOST_DIR=usbhost
FATFS_DIR=lib/oofatfs FATFS_DIR=lib/oofatfs
@ -44,7 +45,7 @@ INC += -I$(TOP)
INC += -I$(BUILD) INC += -I$(BUILD)
INC += -I$(TOP)/lib/cmsis/inc INC += -I$(TOP)/lib/cmsis/inc
INC += -I$(CMSIS_DIR)/ INC += -I$(CMSIS_DIR)/
INC += -I$(HAL_DIR)/inc INC += -I$(TOP)/$(HAL_DIR)/Inc
INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/inc INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/inc
#INC += -I$(USBHOST_DIR) #INC += -I$(USBHOST_DIR)
@ -244,7 +245,7 @@ SRC_O = \
startup_stm32.o \ startup_stm32.o \
gchelper.o \ gchelper.o \
SRC_HAL = $(addprefix $(HAL_DIR)/src/stm32$(MCU_SERIES)xx_,\ SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
hal.c \ hal.c \
hal_adc.c \ hal_adc.c \
hal_adc_ex.c \ hal_adc_ex.c \
@ -449,7 +450,7 @@ GEN_STMCONST_HDR = $(HEADER_BUILD)/modstm_const.h
GEN_STMCONST_QSTR = $(BUILD)/modstm_qstr.h GEN_STMCONST_QSTR = $(BUILD)/modstm_qstr.h
GEN_STMCONST_MPZ = $(HEADER_BUILD)/modstm_mpz.h GEN_STMCONST_MPZ = $(HEADER_BUILD)/modstm_mpz.h
CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]') CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
CMSIS_MCU_HDR = cmsis/$(CMSIS_MCU_LOWER).h CMSIS_MCU_HDR = $(CMSIS_DIR)/$(CMSIS_MCU_LOWER).h
modmachine.c: $(GEN_PLLFREQTABLE_HDR) modmachine.c: $(GEN_PLLFREQTABLE_HDR)
$(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD) $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)