summaryrefslogtreecommitdiff
path: root/stmhal/Makefile
diff options
context:
space:
mode:
authorKrzysztof Blazewicz <krzysztof.blazewicz@uxeon.com>2016-09-19 12:56:26 +0200
committerDamien George <damien.p.george@gmail.com>2016-09-30 16:19:03 +1000
commit6aea34ad89399a801c3e4c58a9b370eb8a047387 (patch)
treea1fe134c8dac9ed49db88df3bb979debd2cffd42 /stmhal/Makefile
parent17b4509564f748b663b31d61cc3614e6bf9ea54d (diff)
lib/cmsis: move CMSIS headers to lib/
Files in lib/cmsis are generic for all Cortex-M MCU's files left in stmhal/cmsis are all STM32 specific.
Diffstat (limited to 'stmhal/Makefile')
-rw-r--r--stmhal/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/stmhal/Makefile b/stmhal/Makefile
index c8c7f97f8..532846234 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -39,8 +39,8 @@ CROSS_COMPILE = arm-none-eabi-
INC += -I.
INC += -I..
INC += -I$(BUILD)
-INC += -I$(CMSIS_DIR)/inc
-INC += -I$(CMSIS_DIR)/devinc
+INC += -I../lib/cmsis/inc
+INC += -I$(CMSIS_DIR)/
INC += -I$(HAL_DIR)/inc
INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/inc
#INC += -I$(USBHOST_DIR)
@@ -388,7 +388,7 @@ GEN_STMCONST_HDR = $(HEADER_BUILD)/modstm_const.h
GEN_STMCONST_QSTR = $(BUILD)/modstm_qstr.h
GEN_STMCONST_MPZ = $(HEADER_BUILD)/modstm_mpz.h
CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
-CMSIS_MCU_HDR = cmsis/devinc/$(CMSIS_MCU_LOWER).h
+CMSIS_MCU_HDR = cmsis/$(CMSIS_MCU_LOWER).h
$(BUILD)/modstm.o: $(GEN_STMCONST_HDR)
# Use a pattern rule here so that make will only call make-stmconst.py once to