mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-12-22 22:38:08 +00:00
update bootloader makefile and micropython submodule
This commit is contained in:
parent
746442c1ee
commit
131b47d029
@ -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)
|
||||
@ -80,8 +80,8 @@ SRC_LIB = $(addprefix lib/,\
|
||||
)
|
||||
|
||||
SRC_C = \
|
||||
bootloader.c \
|
||||
bootloader_ui.c \
|
||||
bootloader/bootloader.c \
|
||||
bootloader/bootloader_ui.c \
|
||||
system_stm32.c \
|
||||
$(wildcard boards/$(BOARD)/*.c)
|
||||
|
||||
@ -168,6 +168,8 @@ else
|
||||
$(Q)$(DFU_UTIL) -a 0 -d $(DEVICE) -D $<
|
||||
endif
|
||||
|
||||
TEXT_ADDR ?= 0x08020000
|
||||
|
||||
deploy-stlink: $(BUILD)/bootloader.dfu
|
||||
$(ECHO) "Writing $(BUILD)/bootloader0.bin to the board via ST-LINK"
|
||||
$(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_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
|
||||
|
2
vendor/micropython
vendored
2
vendor/micropython
vendored
@ -1 +1 @@
|
||||
Subproject commit 5996bcc5fba07d7dbdf1756f166cc881f877ffd3
|
||||
Subproject commit 4ab6e8c3b714d6393c67b359a305ae72f368fe7b
|
Loading…
Reference in New Issue
Block a user