Updated libopencm3. Fixes broken bootloader, issue #43.

This commit is contained in:
Gareth McMullin 2014-05-08 11:02:35 -07:00
parent 8ba0265383
commit 72ae78a185
11 changed files with 24 additions and 5 deletions

@ -1 +1 @@
Subproject commit a909b5ca9e18f802e3caef19e63d38861662c128 Subproject commit 67242de60dec0227739cd549e8a78e1a3c15dbf5

View File

@ -22,6 +22,7 @@
* implementation. * implementation.
*/ */
#include "platform.h"
#include <libopencm3/stm32/f4/rcc.h> #include <libopencm3/stm32/f4/rcc.h>
#include <libopencm3/cm3/systick.h> #include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h> #include <libopencm3/cm3/scb.h>
@ -31,7 +32,6 @@
#include <libopencm3/stm32/syscfg.h> #include <libopencm3/stm32/syscfg.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include "platform.h"
#include "jtag_scan.h" #include "jtag_scan.h"
#include <usbuart.h> #include <usbuart.h>

View File

@ -24,6 +24,9 @@
#ifndef __PLATFORM_H #ifndef __PLATFORM_H
#define __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/stm32/f4/gpio.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>

View File

@ -22,6 +22,8 @@
* implementation. * implementation.
*/ */
#include "platform.h"
#include <libopencm3/stm32/f1/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/cm3/systick.h> #include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h> #include <libopencm3/cm3/scb.h>
@ -31,7 +33,6 @@
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/f1/adc.h> #include <libopencm3/stm32/f1/adc.h>
#include "platform.h"
#include "jtag_scan.h" #include "jtag_scan.h"
#include <usbuart.h> #include <usbuart.h>

View File

@ -24,6 +24,10 @@
#ifndef __PLATFORM_H #ifndef __PLATFORM_H
#define __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/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>

View File

@ -22,6 +22,7 @@
* implementation. * implementation.
*/ */
#include "platform.h"
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/rcc.h>
#include <libopencm3/cm3/systick.h> #include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h> #include <libopencm3/cm3/scb.h>
@ -30,7 +31,6 @@
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/adc.h> #include <libopencm3/stm32/adc.h>
#include "platform.h"
#include "jtag_scan.h" #include "jtag_scan.h"
#include <usbuart.h> #include <usbuart.h>

View File

@ -24,6 +24,10 @@
#ifndef __PLATFORM_H #ifndef __PLATFORM_H
#define __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/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>

View File

@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "platform.h"
#include <libopencm3/stm32/f1/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/cm3/scb.h> #include <libopencm3/cm3/scb.h>

View File

@ -17,6 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "platform.h"
#if defined(STM32F2) #if defined(STM32F2)
# include <libopencm3/stm32/f2/flash.h> # include <libopencm3/stm32/f2/flash.h>
#elif defined(STM32F4) #elif defined(STM32F4)

View File

@ -22,6 +22,7 @@
* implementation. * implementation.
*/ */
#include "platform.h"
#include <libopencm3/stm32/f1/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/cm3/systick.h> #include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/scb.h> #include <libopencm3/cm3/scb.h>
@ -30,7 +31,6 @@
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/stm32/f1/adc.h> #include <libopencm3/stm32/f1/adc.h>
#include "platform.h"
#include "jtag_scan.h" #include "jtag_scan.h"
#include <usbuart.h> #include <usbuart.h>

View File

@ -24,6 +24,10 @@
#ifndef __PLATFORM_H #ifndef __PLATFORM_H
#define __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/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>