arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 04:18:10 +00:00
Code Issues Releases Wiki Activity

build: unix build is now always debug, makefiles cleanup

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-23 18:25:21 +01:00
parent 541d89cff7
commit b6b8873e9a
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -8,7 +8,7 @@ LOADER_BUILD_DIR=micropython/loader/build
FIRMWARE_BUILD_DIR=micropython/firmware/build FIRMWARE_BUILD_DIR=micropython/firmware/build
TREZORHAL_PORT_OPTS=FROZEN_MPY_DIR=src TREZORHAL_PORT_OPTS=FROZEN_MPY_DIR=src
UNIX_PORT_OPTS=MICROPY_FORCE_32BIT=1 MICROPY_PY_BTREE=0 MICROPY_PY_TERMIOS=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 MICROPY_SSL_AXTLS=0 UNIX_PORT_OPTS=MICROPY_FORCE_32BIT=1 MICROPY_PY_BTREE=0 MICROPY_PY_TERMIOS=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 MICROPY_SSL_AXTLS=0 DEBUG=1
CROSS_PORT_OPTS=MICROPY_FORCE_32BIT=1 CROSS_PORT_OPTS=MICROPY_FORCE_32BIT=1
help: ## show this help help: ## show this help
@ -49,9 +49,6 @@ build_loader: vendor ## build loader
build_unix: vendor ## build unix port build_unix: vendor ## build unix port
$(MAKE) -f ../../../micropython/unix/Makefile -C vendor/micropython/unix $(UNIX_PORT_OPTS) $(MAKE) -f ../../../micropython/unix/Makefile -C vendor/micropython/unix $(UNIX_PORT_OPTS)
build_unix_debug: vendor ## build unix port with debug symbols
$(MAKE) -f ../../../micropython/unix/Makefile -C vendor/micropython/unix $(UNIX_PORT_OPTS) DEBUG=1
build_cross: vendor ## build mpy-cross port build_cross: vendor ## build mpy-cross port
$(MAKE) -C vendor/micropython/mpy-cross $(CROSS_PORT_OPTS) $(MAKE) -C vendor/micropython/mpy-cross $(CROSS_PORT_OPTS)
@ -74,7 +71,7 @@ clean_unix: ## clean unix build
clean_cross: ## clean mpy-cross build clean_cross: ## clean mpy-cross build
$(MAKE) -C vendor/micropython/mpy-cross clean $(CROSS_PORT_OPTS) $(MAKE) -C vendor/micropython/mpy-cross clean $(CROSS_PORT_OPTS)
flash: ## flash firmware using st-flash flash_firmware: ## flash firmware using st-flash
st-flash write $(FIRMWARE_BUILD_DIR)/firmware.bin 0x8000000 st-flash write $(FIRMWARE_BUILD_DIR)/firmware.bin 0x8000000
flash_bootloader: ## flash bootloader using st-flash flash_bootloader: ## flash bootloader using st-flash
@ -83,15 +80,6 @@ flash_bootloader: ## flash bootloader using st-flash
flash_loader: ## flash loader using st-flash flash_loader: ## flash loader using st-flash
st-flash write $(LOADER_BUILD_DIR)/loader.bin 0x8000000 st-flash write $(LOADER_BUILD_DIR)/loader.bin 0x8000000
flash_openocd: $(FIRMWARE_BUILD_DIR)/firmware.hex ## flash firmware using openocd
openocd -f interface/stlink-v2.cfg -f target/stm32f4x.cfg \
-c "init" \
-c "reset init" \
-c "stm32f4x mass_erase 0" \
-c "flash write_image $(FIRMWARE_BUILD_DIR)/firmware.hex" \
-c "reset" \
-c "shutdown"
openocd: ## start openocd which connects to the device openocd: ## start openocd which connects to the device
openocd -f interface/stlink-v2.cfg -f target/stm32f4x.cfg openocd -f interface/stlink-v2.cfg -f target/stm32f4x.cfg

1
Makefile.bootloader
View File

@ -98,7 +98,6 @@ SRC_MOD = $(patsubst $(BUILD_FW)%.o, $(SRCDIR_FW)%.c, $(OBJ_MOD))
CROSS_COMPILE = arm-none-eabi- CROSS_COMPILE = arm-none-eabi-
INC += -I. INC += -I.
INC += -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto
INC += -I$(SRCDIR_FW)/extmod/modtrezorui INC += -I$(SRCDIR_FW)/extmod/modtrezorui
INC += -I$(SRCDIR_FW)/firmware INC += -I$(SRCDIR_FW)/firmware
INC += -I$(SRCDIR_FW)/trezorhal INC += -I$(SRCDIR_FW)/trezorhal

1
Makefile.loader
View File

@ -96,7 +96,6 @@ SRC_MOD = $(patsubst $(BUILD_FW)%.o, $(SRCDIR_FW)%.c, $(OBJ_MOD))
CROSS_COMPILE = arm-none-eabi- CROSS_COMPILE = arm-none-eabi-
INC += -I. INC += -I.
INC += -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto
INC += -I$(SRCDIR_FW)/extmod/modtrezorui INC += -I$(SRCDIR_FW)/extmod/modtrezorui
INC += -I$(SRCDIR_FW)/firmware INC += -I$(SRCDIR_FW)/firmware
INC += -I$(SRCDIR_FW)/trezorhal INC += -I$(SRCDIR_FW)/trezorhal