From 72ae78a185d08d9979748dcef3d0cd29deddde9b Mon Sep 17 00:00:00 2001
From: Gareth McMullin <gareth@blacksphere.co.nz>
Date: Thu, 8 May 2014 11:02:35 -0700
Subject: [PATCH] Updated libopencm3.  Fixes broken bootloader, issue #43.

---
 libopencm3                           | 2 +-
 src/platforms/f4discovery/platform.c | 2 +-
 src/platforms/f4discovery/platform.h | 3 +++
 src/platforms/native/platform.c      | 3 ++-
 src/platforms/native/platform.h      | 4 ++++
 src/platforms/stlink/platform.c      | 2 +-
 src/platforms/stlink/platform.h      | 4 ++++
 src/platforms/stm32/dfu_f1.c         | 1 +
 src/platforms/stm32/dfu_f4.c         | 2 ++
 src/platforms/swlink/platform.c      | 2 +-
 src/platforms/swlink/platform.h      | 4 ++++
 11 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/libopencm3 b/libopencm3
index a909b5c..67242de 160000
--- a/libopencm3
+++ b/libopencm3
@@ -1 +1 @@
-Subproject commit a909b5ca9e18f802e3caef19e63d38861662c128
+Subproject commit 67242de60dec0227739cd549e8a78e1a3c15dbf5
diff --git a/src/platforms/f4discovery/platform.c b/src/platforms/f4discovery/platform.c
index 2786954..5b073e9 100644
--- a/src/platforms/f4discovery/platform.c
+++ b/src/platforms/f4discovery/platform.c
@@ -22,6 +22,7 @@
  * implementation.
  */
 
+#include "platform.h"
 #include <libopencm3/stm32/f4/rcc.h>
 #include <libopencm3/cm3/systick.h>
 #include <libopencm3/cm3/scb.h>
@@ -31,7 +32,6 @@
 #include <libopencm3/stm32/syscfg.h>
 #include <libopencm3/usb/usbd.h>
 
-#include "platform.h"
 #include "jtag_scan.h"
 #include <usbuart.h>
 
diff --git a/src/platforms/f4discovery/platform.h b/src/platforms/f4discovery/platform.h
index a777ed2..bbf01e1 100644
--- a/src/platforms/f4discovery/platform.h
+++ b/src/platforms/f4discovery/platform.h
@@ -24,6 +24,9 @@
 #ifndef __PLATFORM_H
 #define __PLATFORM_H
 
+#include <stdint.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/f4/memorymap.h>
 #include <libopencm3/stm32/f4/gpio.h>
 #include <libopencm3/usb/usbd.h>
 
diff --git a/src/platforms/native/platform.c b/src/platforms/native/platform.c
index d6ca992..cb9e69e 100644
--- a/src/platforms/native/platform.c
+++ b/src/platforms/native/platform.c
@@ -22,6 +22,8 @@
  * implementation.
  */
 
+#include "platform.h"
+
 #include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/cm3/systick.h>
 #include <libopencm3/cm3/scb.h>
@@ -31,7 +33,6 @@
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/stm32/f1/adc.h>
 
-#include "platform.h"
 #include "jtag_scan.h"
 #include <usbuart.h>
 
diff --git a/src/platforms/native/platform.h b/src/platforms/native/platform.h
index 2916e64..082f6ef 100644
--- a/src/platforms/native/platform.h
+++ b/src/platforms/native/platform.h
@@ -24,6 +24,10 @@
 #ifndef __PLATFORM_H
 #define __PLATFORM_H
 
+#include <stdint.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/f1/memorymap.h>
+
 #include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/usb/usbd.h>
 
diff --git a/src/platforms/stlink/platform.c b/src/platforms/stlink/platform.c
index ec8c000..1369c37 100644
--- a/src/platforms/stlink/platform.c
+++ b/src/platforms/stlink/platform.c
@@ -22,6 +22,7 @@
  * implementation.
  */
 
+#include "platform.h"
 #include <libopencm3/stm32/rcc.h>
 #include <libopencm3/cm3/systick.h>
 #include <libopencm3/cm3/scb.h>
@@ -30,7 +31,6 @@
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/stm32/adc.h>
 
-#include "platform.h"
 #include "jtag_scan.h"
 #include <usbuart.h>
 
diff --git a/src/platforms/stlink/platform.h b/src/platforms/stlink/platform.h
index 6268a0e..0780706 100644
--- a/src/platforms/stlink/platform.h
+++ b/src/platforms/stlink/platform.h
@@ -24,6 +24,10 @@
 #ifndef __PLATFORM_H
 #define __PLATFORM_H
 
+#include <stdint.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/f1/memorymap.h>
+
 #include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/usb/usbd.h>
 
diff --git a/src/platforms/stm32/dfu_f1.c b/src/platforms/stm32/dfu_f1.c
index 77b6f58..bb1e274 100644
--- a/src/platforms/stm32/dfu_f1.c
+++ b/src/platforms/stm32/dfu_f1.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "platform.h"
 
 #include <libopencm3/stm32/f1/flash.h>
 #include <libopencm3/cm3/scb.h>
diff --git a/src/platforms/stm32/dfu_f4.c b/src/platforms/stm32/dfu_f4.c
index 1421b19..3d1e369 100644
--- a/src/platforms/stm32/dfu_f4.c
+++ b/src/platforms/stm32/dfu_f4.c
@@ -17,6 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "platform.h"
+
 #if defined(STM32F2)
 #	include <libopencm3/stm32/f2/flash.h>
 #elif defined(STM32F4)
diff --git a/src/platforms/swlink/platform.c b/src/platforms/swlink/platform.c
index 28db60f..0f5695d 100644
--- a/src/platforms/swlink/platform.c
+++ b/src/platforms/swlink/platform.c
@@ -22,6 +22,7 @@
  * implementation.
  */
 
+#include "platform.h"
 #include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/cm3/systick.h>
 #include <libopencm3/cm3/scb.h>
@@ -30,7 +31,6 @@
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/stm32/f1/adc.h>
 
-#include "platform.h"
 #include "jtag_scan.h"
 #include <usbuart.h>
 
diff --git a/src/platforms/swlink/platform.h b/src/platforms/swlink/platform.h
index dd2ac8a..fe3dc46 100644
--- a/src/platforms/swlink/platform.h
+++ b/src/platforms/swlink/platform.h
@@ -24,6 +24,10 @@
 #ifndef __PLATFORM_H
 #define __PLATFORM_H
 
+#include <stdint.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/f1/memorymap.h>
+
 #include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/usb/usbd.h>