From 3d6bfddc5fd07eaab6dcbd0c3b668f03914c3e6b Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Tue, 4 Jul 2017 20:21:10 +0200
Subject: [PATCH] move -Os flag to Makefiles of bootloader and fastflash

---
 .travis.yml                | 4 ++--
 bootloader-docker-build.sh | 1 -
 bootloader/Makefile        | 6 ++++--
 fastflash/Makefile         | 6 ++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 72a6010..0fee46d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ addons:
 script:
   - CFLAGS="-std=c99" make -C vendor/libopencm3
   - make
-  - OPTFLAGS="-Os" make -C bootloader
-  - OPTFLAGS="-Os" make -C fastflash
+  - make -C bootloader
+  - make -C fastflash
   - make -C firmware
   - make -C demo
   - make -C firmware clean && make -C firmware FASTFLASH=1
diff --git a/bootloader-docker-build.sh b/bootloader-docker-build.sh
index 5a136f0..7387d63 100755
--- a/bootloader-docker-build.sh
+++ b/bootloader-docker-build.sh
@@ -11,7 +11,6 @@ docker run -t -v $(pwd)/output:/output $IMAGETAG /bin/sh -c "\
 	git checkout $FIRMWARETAG && \
 	git submodule update --init && \
 	CFLAGS='-std=c99' make -C vendor/libopencm3 && \
-	export OPTFLAGS=-Os
 	make && \
 	make -C bootloader && \
 	cp bootloader/bootloader.bin /output/bootloader-$FIRMWARETAG.bin"
diff --git a/bootloader/Makefile b/bootloader/Makefile
index 8c1f18d..6a2dc5f 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -4,14 +4,16 @@ OBJS += bootloader.o
 OBJS += signatures.o
 OBJS += usb.o
 
-OBJS += ../vendor/trezor-crypto/bignum.o
+OBJS += ../vendor/trezor-crypto/bignum.small.o
 OBJS += ../vendor/trezor-crypto/ecdsa.small.o
 OBJS += ../vendor/trezor-crypto/secp256k1.small.o
-OBJS += ../vendor/trezor-crypto/sha2.o
+OBJS += ../vendor/trezor-crypto/sha2.small.o
 
 CFLAGS += -DUSE_PRECOMPUTED_IV=0
 CFLAGS += -DUSE_PRECOMPUTED_CP=0
 
+OPTFLAGS ?= -Os
+
 include ../Makefile.include
 
 align: $(NAME).bin
diff --git a/fastflash/Makefile b/fastflash/Makefile
index ee0c455..24ca20a 100644
--- a/fastflash/Makefile
+++ b/fastflash/Makefile
@@ -6,14 +6,16 @@ OBJS += bootloader.o
 OBJS += signatures.o
 OBJS += usb.o
 
-OBJS += ../vendor/trezor-crypto/bignum.o
+OBJS += ../vendor/trezor-crypto/bignum.small.o
 OBJS += ../vendor/trezor-crypto/ecdsa.small.o
 OBJS += ../vendor/trezor-crypto/secp256k1.small.o
-OBJS += ../vendor/trezor-crypto/sha2.o
+OBJS += ../vendor/trezor-crypto/sha2.small.o
 
 CFLAGS += -DUSE_PRECOMPUTED_IV=0
 CFLAGS += -DUSE_PRECOMPUTED_CP=0
 
+OPTFLAGS ?= -Os
+
 include ../Makefile.include
 
 CFLAGS += -I../bootloader