arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 07:28:10 +00:00
Code Issues Releases Wiki Activity

update bootloader makefile and micropython submodule

Browse Source
This commit is contained in:
Pavol Rusnak 2016-10-04 11:54:51 +02:00
parent 746442c1ee
commit 131b47d029
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bootloader/Makefile.bootloader
View File

@ -39,8 +39,8 @@ CROSS_COMPILE = arm-none-eabi-
INC += -I. INC += -I.
INC += -I.. INC += -I..
INC += -I$(BUILD) INC += -I$(BUILD)
INC += -I$(CMSIS_DIR)/inc INC += -I../lib/cmsis/inc
INC += -I$(CMSIS_DIR)/devinc INC += -I$(CMSIS_DIR)/
INC += -I$(HAL_DIR)/inc INC += -I$(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)
@ -80,8 +80,8 @@ SRC_LIB = $(addprefix lib/,\
) )
SRC_C = \ SRC_C = \
bootloader.c \ bootloader/bootloader.c \
bootloader_ui.c \ bootloader/bootloader_ui.c \
system_stm32.c \ system_stm32.c \
$(wildcard boards/$(BOARD)/*.c) $(wildcard boards/$(BOARD)/*.c)
@ -168,6 +168,8 @@ else
$(Q)$(DFU_UTIL) -a 0 -d $(DEVICE) -D $< $(Q)$(DFU_UTIL) -a 0 -d $(DEVICE) -D $<
endif endif
TEXT_ADDR ?= 0x08020000
deploy-stlink: $(BUILD)/bootloader.dfu deploy-stlink: $(BUILD)/bootloader.dfu
$(ECHO) "Writing $(BUILD)/bootloader0.bin to the board via ST-LINK" $(ECHO) "Writing $(BUILD)/bootloader0.bin to the board via ST-LINK"
$(Q)$(STFLASH) write $(BUILD)/bootloader0.bin 0x08000000 $(Q)$(STFLASH) write $(BUILD)/bootloader0.bin 0x08000000
@ -243,7 +245,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/devinc/$(CMSIS_MCU_LOWER).h CMSIS_MCU_HDR = cmsis/$(CMSIS_MCU_LOWER).h
$(BUILD)/modstm.o: $(GEN_STMCONST_HDR) $(BUILD)/modstm.o: $(GEN_STMCONST_HDR)
# Use a pattern rule here so that make will only call make-stmconst.py once to # Use a pattern rule here so that make will only call make-stmconst.py once to

2
vendor/micropython vendored

@ -1 +1 @@
Subproject commit 5996bcc5fba07d7dbdf1756f166cc881f877ffd3 Subproject commit 4ab6e8c3b714d6393c67b359a305ae72f368fe7b