From b6b8873e9aa8a045af8e1fbe2e1a2396d8bd413f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Thu, 23 Mar 2017 18:25:21 +0100
Subject: [PATCH] build: unix build is now always debug, makefiles cleanup

---
 Makefile            | 16 ++--------------
 Makefile.bootloader |  1 -
 Makefile.loader     |  1 -
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 7a0755060..bbd6f3526 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ LOADER_BUILD_DIR=micropython/loader/build
 FIRMWARE_BUILD_DIR=micropython/firmware/build
 
 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
 
 help: ## show this help
@@ -49,9 +49,6 @@ build_loader: vendor ## build loader
 build_unix: vendor ## build unix port
 	$(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
 	$(MAKE) -C vendor/micropython/mpy-cross $(CROSS_PORT_OPTS)
 
@@ -74,7 +71,7 @@ clean_unix: ## clean unix build
 clean_cross: ## clean mpy-cross build
 	$(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
 
 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
 	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 -f interface/stlink-v2.cfg -f target/stm32f4x.cfg
 
diff --git a/Makefile.bootloader b/Makefile.bootloader
index f432f519f..a589a020c 100644
--- a/Makefile.bootloader
+++ b/Makefile.bootloader
@@ -98,7 +98,6 @@ SRC_MOD = $(patsubst $(BUILD_FW)%.o, $(SRCDIR_FW)%.c, $(OBJ_MOD))
 CROSS_COMPILE = arm-none-eabi-
 
 INC += -I.
-INC += -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto
 INC += -I$(SRCDIR_FW)/extmod/modtrezorui
 INC += -I$(SRCDIR_FW)/firmware
 INC += -I$(SRCDIR_FW)/trezorhal
diff --git a/Makefile.loader b/Makefile.loader
index a8d81a7f4..8a671f26b 100644
--- a/Makefile.loader
+++ b/Makefile.loader
@@ -96,7 +96,6 @@ SRC_MOD = $(patsubst $(BUILD_FW)%.o, $(SRCDIR_FW)%.c, $(OBJ_MOD))
 CROSS_COMPILE = arm-none-eabi-
 
 INC += -I.
-INC += -I$(SRCDIR_FW)/extmod/modtrezorcrypto/trezor-crypto
 INC += -I$(SRCDIR_FW)/extmod/modtrezorui
 INC += -I$(SRCDIR_FW)/firmware
 INC += -I$(SRCDIR_FW)/trezorhal