From 5968eb3f5f67a443b6bc0016457a84a7e75f93ce Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Tue, 17 May 2016 17:17:23 +0200
Subject: [PATCH] add build_cross and build_frozen make targets

---
 Makefile                     | 20 ++++++++++++++++----
 extmod/modtrezorui/display.c |  4 +---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 2ba2688e66..a0c0584f1f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,22 +3,34 @@
 STMHAL_BUILD_DIR=vendor/micropython/stmhal/build-TREZORV2
 
 help: ## show this help
-	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36mmake %-15s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z0-9_-]+:.*?## / {printf "\033[36mmake %-15s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
 vendor: ## update git submodules
 	git submodule update --init
 
-build: build_stmhal build_unix ## build both stmhal and unix micropython ports
+build: build_stmhal build_unix ## build both stmhal and 32-bit unix micropython ports
 
 build_stmhal: vendor ## build stmhal port
 	make -C vendor/micropython/stmhal
 
-build_unix: vendor ## build unix port (32-bit)
+build_unix: vendor ## build 32-bit unix port
 	make -C vendor/micropython/unix MICROPY_FORCE_32BIT=1
 
-build_unix64: vendor ## build unix port (64-bit)
+build_cross: vendor ## build 32-bit mpy-cross port
+	make -C vendor/micropython/mpy-cross MICROPY_FORCE_32BIT=1
+
+build_frozen: vendor build_cross ## build 32-bit unix port with frozen modules (from vendor/micropython/unix/frozen)
+	make -C vendor/micropython/unix FROZEN_MPY_DIR=frozen MICROPY_FORCE_32BIT=1
+
+build_unix64: vendor ## build 64-bit unix port
 	make -C vendor/micropython/unix
 
+build_cross64: vendor ## build 64-bit mpy-cross port
+	make -C vendor/micropython/mpy-cross
+
+build_frozen64: vendor build_cross ## build 64-bit unix port with frozen modules (from vendor/micropython/unix/frozen)
+	make -C vendor/micropython/unix FROZEN_MPY_DIR=frozen
+
 run: ## run unix port
 	cd src ; ../vendor/micropython/unix/micropython
 
diff --git a/extmod/modtrezorui/display.c b/extmod/modtrezorui/display.c
index f16c5fef1f..446cb4b11e 100644
--- a/extmod/modtrezorui/display.c
+++ b/extmod/modtrezorui/display.c
@@ -17,10 +17,8 @@
 
 #if defined STM32_HAL_H
 #include "display-stmhal.h"
-#elif defined UNIX
-#include "display-unix.h"
 #else
-#error Unsupported port. Only STMHAL and UNIX ports are supported.
+#include "display-unix.h"
 #endif
 
 // common display functions