From 2c56c4de1b4aff82cd4e13ff5c6304f73b87174b Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Wed, 2 May 2018 13:15:12 +0100
Subject: [PATCH] firmware: use -Os except for crypto/nanopb parts

---
 firmware/Makefile | 7 +++++++
 firmware/fsm.c    | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/firmware/Makefile b/firmware/Makefile
index 8aaae3854c..f5341021e2 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -82,6 +82,13 @@ OBJS += ../vendor/nanopb/pb_encode.o
 OBJS += protob/messages.pb.o
 OBJS += protob/types.pb.o
 
+OPTFLAGS ?= -Os
+
+../vendor/trezor-crypto/%.o: OPTFLAGS = -O3
+../vendor/trezor-crypto/aes/%.o: OPTFLAGS = -O3
+../vendor/trezor-crypto/ed25519-donna/%.o: OPTFLAGS = -O3
+../vendor/nanopb/%.o: OPTFLAGS = -O3
+
 include ../Makefile.include
 
 DEBUG_LINK ?= 0
diff --git a/firmware/fsm.c b/firmware/fsm.c
index d6e653efec..72093a0df6 100644
--- a/firmware/fsm.c
+++ b/firmware/fsm.c
@@ -1717,7 +1717,8 @@ void fsm_msgDebugLinkMemoryWrite(DebugLinkMemoryWrite *msg)
 			memcpy(&word, msg->memory.bytes + i, 4);
 			flash_write32(msg->address + i, word);
 		}
-		svc_flash_lock();
+		uint32_t dummy = svc_flash_lock();
+		(void)dummy;
 	} else {
 #if !EMULATOR
 		memcpy((void *) msg->address, msg->memory.bytes, length);
@@ -1729,6 +1730,7 @@ void fsm_msgDebugLinkFlashErase(DebugLinkFlashErase *msg)
 {
 	svc_flash_unlock();
 	svc_flash_erase_sector(msg->sector);
-	svc_flash_lock();
+	uint32_t dummy = svc_flash_lock();
+	(void)dummy;
 }
 #endif