cleanup makefile

.travis.yml

@@ -12,4 +12,4 @@ before_script:
   - make build_unix
 
 script:
-  - cd src/tests && bash ./runtests.sh
+  - make test

Makefile

@@ -9,29 +9,29 @@ vendor: ## update git submodules
 	git submodule update --init
 
 res: ## update resources
-	python3 tools/res_collect.py
+	./tools/res_collect.py
 
 build: build_stmhal build_unix build_cross ## build stmhal, unix and mpy-cross micropython ports
 
-build_stmhal: vendor res ## build stmhal port
+build_stmhal: vendor ## build stmhal port
 	make -C vendor/micropython/stmhal
 
-build_stmhal_debug: vendor res ## build stmhal port with debug symbols
+build_stmhal_debug: vendor ## build stmhal port with debug symbols
 	make -C vendor/micropython/stmhal
 
 build_stmhal_frozen: vendor res build_cross ## build stmhal port with frozen modules (from /src)
 	make -C vendor/micropython/stmhal FROZEN_MPY_DIR=../../../src
 
-build_unix: vendor res ## build unix port
+build_unix: vendor ## build unix port
 	make -C vendor/micropython/unix MICROPY_FORCE_32BIT=1
 
-build_unix_debug: vendor res ## build unix port with debug symbols
+build_unix_debug: vendor ## build unix port with debug symbols
 	make -C vendor/micropython/unix MICROPY_FORCE_32BIT=1 DEBUG=1
 
 build_unix_frozen: vendor res build_cross ## build unix port with frozen modules (from /src)
 	make -C vendor/micropython/unix MICROPY_FORCE_32BIT=1 FROZEN_MPY_DIR=../../../src
 
-build_cross: vendor res ## build mpy-cross port
+build_cross: vendor ## build mpy-cross port
 	make -C vendor/micropython/mpy-cross MICROPY_FORCE_32BIT=1
 
 build_bootloader: vendor ## build bootloader
@@ -62,26 +62,26 @@ flash: ## flash firmware using st-flash
 	sleep 0.1
 	st-flash write $(STMHAL_BUILD_DIR)/firmware1.bin 0x8020000
 
-flash_bootloader: vendor ## flash bootloader using st-flash
+flash_bl: vendor ## flash bootloader using st-flash
 	st-flash write $(STMHAL_BUILD_DIR)/bootloader0.bin 0x8000000
 	sleep 0.1
 	st-flash write $(STMHAL_BUILD_DIR)/bootloader1.bin 0x8020000
 
-openocd_flash_bootloader: $(STMHAL_BUILD_DIR)/bootloader.hex ## flash bootloader using openocd
+openocd_flash: $(STMHAL_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 $(STMHAL_BUILD_DIR)/bootloader.hex" \
+		-c "flash write_image $(STMHAL_BUILD_DIR)/firmware.hex" \
 		-c "reset" \
 		-c "shutdown"
 
-openocd_flash_firmware: $(STMHAL_BUILD_DIR)/firmware.hex ## flash firmware using openocd
+openocd_flash_bl: $(STMHAL_BUILD_DIR)/bootloader.hex ## flash bootloader 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 $(STMHAL_BUILD_DIR)/firmware.hex" \
+		-c "flash write_image $(STMHAL_BUILD_DIR)/bootloader.hex" \
 		-c "reset" \
 		-c "shutdown"
 
@@ -91,7 +91,7 @@ openocd: ## start openocd which connects to the device
 gdb: ## start remote gdb session which connects to the openocd
 	arm-none-eabi-gdb $(STMHAL_BUILD_DIR)/firmware.elf -ex 'target remote localhost:3333'
 
-gdb_bootloader: ## start remote gdb session which connects to the openocd
+gdb_bl: ## start remote gdb session which connects to the openocd
 	arm-none-eabi-gdb $(STMHAL_BUILD_DIR)/bootloader.elf -ex 'target remote localhost:3333'
 
 load: ## load contents of src into mass storage of trezor