move -Os flag to Makefiles of bootloader and fastflash

.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

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"

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

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