From 6a04b2e90ec93e2c459390aab270094d52860d7e Mon Sep 17 00:00:00 2001
From: mcudev <29890609+mcudev@users.noreply.github.com>
Date: Mon, 28 Aug 2017 07:47:15 -0400
Subject: [PATCH] cleanup build, update libopencm3 (#215)

---
 .travis.yml         | 2 +-
 build-bootloader.sh | 3 +--
 build-firmware.sh   | 3 +--
 vendor/libopencm3   | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a260dbd..95eed0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ env:
     - DEBUG_LINK=1 FASTFLASH=1
 
 script:
-  - CFLAGS="-std=c99" make -C vendor/libopencm3 lib/stm32/f2
+  - make -C vendor/libopencm3 lib/stm32/f2
   - make
   - make -C bootloader
   - make -C fastflash
diff --git a/build-bootloader.sh b/build-bootloader.sh
index d7c7afd..fe41356 100755
--- a/build-bootloader.sh
+++ b/build-bootloader.sh
@@ -12,9 +12,8 @@ docker run -t -v $(pwd)/build:/build:z $IMAGE /bin/sh -c "\
 	cd trezor-mcu && \
 	git checkout $TAG && \
 	git submodule update --init && \
-	CFLAGS='-std=c99' make -C vendor/libopencm3 && \
+	make -C vendor/libopencm3 && \
 	make && \
-	make -C bootloader && \
 	make -C bootloader align && \
 	cp bootloader/bootloader.bin /$BINFILE && \
 	cp bootloader/bootloader.elf /$ELFFILE"
diff --git a/build-firmware.sh b/build-firmware.sh
index 3eb6365..a045e7c 100755
--- a/build-firmware.sh
+++ b/build-firmware.sh
@@ -12,9 +12,8 @@ docker run -t -v $(pwd)/build:/build:z $IMAGE /bin/sh -c "\
 	cd trezor-mcu && \
 	git checkout $TAG && \
 	git submodule update --init && \
-	CFLAGS='-std=c99' make -C vendor/libopencm3 && \
+	make -C vendor/libopencm3 && \
 	make && \
-	make -C firmware && \
 	make -C firmware sign && \
 	cp firmware/trezor.bin /$BINFILE && \
 	cp firmware/trezor.elf /$ELFFILE"
diff --git a/vendor/libopencm3 b/vendor/libopencm3
index b76d853..b0e050d 160000
--- a/vendor/libopencm3
+++ b/vendor/libopencm3
@@ -1 +1 @@
-Subproject commit b76d853a723d39bbc083495bb7460cf3f071476c
+Subproject commit b0e050d10d12c42be031c34822117cfd3c5a0ea7