From 0a66d52ec836b361521652a09c3ebf7cd91fcd0f Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Sun, 2 Oct 2011 01:13:14 -0700
Subject: [PATCH 01/51] Switched the makefile default from arm-elf to
 arm-none-eabi.

---
 examples/stm32/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/stm32/Makefile.include b/examples/stm32/Makefile.include
index acb78e8e..f370f457 100644
--- a/examples/stm32/Makefile.include
+++ b/examples/stm32/Makefile.include
@@ -18,8 +18,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX	?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy

From 5d97653163c3ea5148655a875c30cfef4ecbb60d Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Sun, 2 Oct 2011 01:20:44 -0700
Subject: [PATCH 02/51] Added black magic probe flashing support to the example
 code makefile.

---
 Makefile                            |  4 ++++
 examples/stm32/Makefile.include     | 13 +++++++++++++
 scripts/black_magic_probe_debug.scr |  4 ++++
 scripts/black_magic_probe_flash.scr |  4 ++++
 4 files changed, 25 insertions(+)
 create mode 100644 scripts/black_magic_probe_debug.scr
 create mode 100644 scripts/black_magic_probe_flash.scr

diff --git a/Makefile b/Makefile
index fe8db6a0..766073d2 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ PREFIX		?= arm-elf
 DESTDIR		?= /usr/local
 INCDIR		= $(DESTDIR)/$(PREFIX)/include
 LIBDIR		= $(DESTDIR)/$(PREFIX)/lib
+SHAREDIR        = $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts
 INSTALL		= install
 
 TARGETS = stm32 lpc13xx lm3s
@@ -57,11 +58,14 @@ install: lib
 	@printf "  INSTALL headers\n"
 	$(Q)$(INSTALL) -d $(INCDIR)/libopencm3
 	$(Q)$(INSTALL) -d $(LIBDIR)
+	$(Q)$(INSTALL) -d $(SHAREDIR)
 	$(Q)cp -r include/libopencm3/* $(INCDIR)/libopencm3
 	@printf "  INSTALL libs\n"
 	$(Q)$(INSTALL) -m 0644 lib/*/*.a $(LIBDIR)
 	@printf "  INSTALL ldscripts\n"
 	$(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR)
+	@printf "  INSTALL scripts\n"
+	$(Q)$(INSTALL) -m 0644 scripts/* $(SHAREDIR)
 
 clean:
 	$(Q)for i in $(addprefix lib/,$(TARGETS)) \
diff --git a/examples/stm32/Makefile.include b/examples/stm32/Makefile.include
index f370f457..a4512e9a 100644
--- a/examples/stm32/Makefile.include
+++ b/examples/stm32/Makefile.include
@@ -24,6 +24,7 @@ CC		= $(PREFIX)-gcc
 LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
+GDB		= $(PREFIX)-gdb
 # Uncomment this line if you want to use the installed (not local) library.
 # TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
 TOOLCHAIN_DIR   = ../../../..
@@ -38,6 +39,9 @@ OBJS		+= $(BINARY).o
 OOCD		?= openocd
 OOCD_INTERFACE	?= flossjtag
 OOCD_BOARD	?= olimex_stm32_h103
+# Black magic probe specific variables
+# Set the BMP_PORT to a serial port and then BMP is used for flashing
+BMP_PORT        ?=
 
 # Be silent per default, but 'make V=1' will show all compiler calls.
 ifneq ($(V),1)
@@ -92,6 +96,7 @@ clean:
 	$(Q)rm -f *.srec
 	$(Q)rm -f *.list
 
+ifeq ($(BMP_PORT),)
 ifeq ($(OOCD_SERIAL),)
 %.flash: %.hex
 	@printf "  FLASH   $<\n"
@@ -116,6 +121,14 @@ else
 		    -c "reset" \
 		    -c "shutdown" $(NULL)
 endif
+else
+%.flash: %.elf
+	@echo "  GDB   $(*).elf (flash)"
+	$(Q)$(GDB) --batch \
+		-ex 'target extended-remote $(BMP_PORT)' \
+		-x $(TOOLCHAIN_DIR)/scripts/black_magic_probe_flash.scr \
+		$(*).elf
+endif
 
 .PHONY: images clean
 
diff --git a/scripts/black_magic_probe_debug.scr b/scripts/black_magic_probe_debug.scr
new file mode 100644
index 00000000..0bf774c4
--- /dev/null
+++ b/scripts/black_magic_probe_debug.scr
@@ -0,0 +1,4 @@
+monitor version
+monitor swdp_scan
+attach 1
+run
diff --git a/scripts/black_magic_probe_flash.scr b/scripts/black_magic_probe_flash.scr
new file mode 100644
index 00000000..27663c8f
--- /dev/null
+++ b/scripts/black_magic_probe_flash.scr
@@ -0,0 +1,4 @@
+monitor version
+monitor swdp_scan
+attach 1
+load

From 03a4a18ed646413125217208e8eed48e1a33f58c Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Tue, 4 Oct 2011 13:06:56 -0700
Subject: [PATCH 03/51] Switched all makefiles to arm-none-eabi default.

---
 Makefile                          | 4 ++--
 examples/lm3s/Makefile.include    | 4 ++--
 examples/lpc13xx/Makefile.include | 4 ++--
 lib/lm3s/Makefile                 | 4 ++--
 lib/lpc13xx/Makefile              | 4 ++--
 lib/stm32/Makefile                | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 766073d2..fe06961f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 DESTDIR		?= /usr/local
 INCDIR		= $(DESTDIR)/$(PREFIX)/include
 LIBDIR		= $(DESTDIR)/$(PREFIX)/lib
diff --git a/examples/lm3s/Makefile.include b/examples/lm3s/Makefile.include
index 764a145a..24248325 100644
--- a/examples/lm3s/Makefile.include
+++ b/examples/lm3s/Makefile.include
@@ -18,8 +18,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
diff --git a/examples/lpc13xx/Makefile.include b/examples/lpc13xx/Makefile.include
index c9ae180a..fe2c3ba0 100644
--- a/examples/lpc13xx/Makefile.include
+++ b/examples/lpc13xx/Makefile.include
@@ -18,8 +18,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
diff --git a/lib/lm3s/Makefile b/lib/lm3s/Makefile
index 2bdbd720..93a67ad9 100644
--- a/lib/lm3s/Makefile
+++ b/lib/lm3s/Makefile
@@ -19,8 +19,8 @@
 
 LIBNAME		= libopencm3_lm3s
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 AR		= $(PREFIX)-ar
 CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
diff --git a/lib/lpc13xx/Makefile b/lib/lpc13xx/Makefile
index 7181a08b..04e33c87 100644
--- a/lib/lpc13xx/Makefile
+++ b/lib/lpc13xx/Makefile
@@ -19,8 +19,8 @@
 
 LIBNAME		= libopencm3_lpc13xx
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 AR		= $(PREFIX)-ar
 CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
diff --git a/lib/stm32/Makefile b/lib/stm32/Makefile
index 095f5248..5f26c295 100644
--- a/lib/stm32/Makefile
+++ b/lib/stm32/Makefile
@@ -19,8 +19,8 @@
 
 LIBNAME		= libopencm3_stm32
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX		?= arm-none-eabi
+#PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 AR		= $(PREFIX)-ar
 CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \

From 9e4522ad21d9489b912e39e5ecac7143e997b8fd Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Tue, 4 Oct 2011 23:53:16 -0700
Subject: [PATCH 04/51] Corrected led io for lisa/m v1.1 cleaned up some
 whitespace. Trying to get it to work...

---
 examples/stm32/lisa-m/usb_hid/usbhid.c | 70 ++++++++++++++------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.c b/examples/stm32/lisa-m/usb_hid/usbhid.c
index 5314241e..414f346a 100644
--- a/examples/stm32/lisa-m/usb_hid/usbhid.c
+++ b/examples/stm32/lisa-m/usb_hid/usbhid.c
@@ -2,6 +2,7 @@
  * This file is part of the libopencm3 project.
  *
  * Copyright (C) 2010 Gareth McMullin <gareth@blacksphere.co.nz>
+ * Copyright (C) 2011 Piotr Esden-Tempski <piotr@esden.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,20 +34,20 @@
 #endif
 
 const struct usb_device_descriptor dev = {
-        .bLength = USB_DT_DEVICE_SIZE,
-        .bDescriptorType = USB_DT_DEVICE,
-        .bcdUSB = 0x0200,
-        .bDeviceClass = 0,
-        .bDeviceSubClass = 0,
-        .bDeviceProtocol = 0,
-        .bMaxPacketSize0 = 64,
-        .idVendor = 0x0483,
-        .idProduct = 0x5710,
-        .bcdDevice = 0x0200,
-        .iManufacturer = 1,
-        .iProduct = 2,
-        .iSerialNumber = 3,
-        .bNumConfigurations = 1,
+	.bLength = USB_DT_DEVICE_SIZE,
+	.bDescriptorType = USB_DT_DEVICE,
+	.bcdUSB = 0x0200,
+	.bDeviceClass = 0,
+	.bDeviceSubClass = 0,
+	.bDeviceProtocol = 0,
+	.bMaxPacketSize0 = 64,
+	.idVendor = 0x0483,
+	.idProduct = 0x5710,
+	.bcdDevice = 0x0200,
+	.iManufacturer = 1,
+	.iProduct = 2,
+	.iSerialNumber = 3,
+	.bNumConfigurations = 1,
 };
 
 /* I have no idea what this means.  I haven't read the HID spec. */
@@ -174,10 +175,10 @@ static int hid_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
 {
 	(void)complete;
 
-	if((req->bmRequestType != 0x81) || 
+	if((req->bmRequestType != 0x81) ||
 	   (req->bRequest != USB_REQ_GET_DESCRIPTOR) ||
-	   (req->wValue != 0x2200)) 
-		return 0; 
+	   (req->wValue != 0x2200))
+		return 0;
 
 	/* Handle the HID report descriptor */
 	*buf = (u8*)hid_report_descriptor;
@@ -192,7 +193,7 @@ static void dfu_detach_complete(struct usb_setup_data *req)
 	(void)req;
 
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15);
-	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, 
+	gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
 			GPIO_CNF_OUTPUT_PUSHPULL, GPIO10);
 	gpio_set(GPIOA, GPIO10);
 	scb_reset_core();
@@ -201,10 +202,10 @@ static void dfu_detach_complete(struct usb_setup_data *req)
 static int dfu_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
 			void (**complete)(struct usb_setup_data *req))
 {
-	(void)buf; 
+	(void)buf;
 	(void)len;
 
-	if((req->bmRequestType != 0x21) || (req->bRequest != DFU_DETACH)) 
+	if((req->bmRequestType != 0x21) || (req->bRequest != DFU_DETACH))
 		return 0; /* Only accept class request */
 
 	*complete = dfu_detach_complete;
@@ -230,7 +231,7 @@ static void hid_set_config(u16 wValue)
 				dfu_control_request);
 #endif
 
-	systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8); 
+	systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8);
 	systick_set_reload(100000);
 	systick_interrupt_enable();
 	systick_counter_enable();
@@ -238,41 +239,44 @@ static void hid_set_config(u16 wValue)
 
 int main(void)
 {
-        rcc_clock_setup_in_hsi_out_48mhz();
+	int usb_connect_blink = 0;
+	rcc_clock_setup_in_hsi_out_48mhz();
 
 
 	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
 	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
 
 	/* USB_DETECT as input */
-	gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 
+	gpio_set_mode(GPIOA, GPIO_MODE_INPUT,
 			GPIO_CNF_INPUT_FLOAT, GPIO8);
 
 	/* disconnect USB_DISC, as output */
 	gpio_set(GPIOC, GPIO15);
-	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, 
+	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
 			GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);
 
 	/* green LED off, as output */
-	gpio_clear(GPIOC, GPIO13);
-	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, 
-			GPIO_CNF_OUTPUT_PUSHPULL, GPIO13);
+	gpio_set(GPIOC, GPIO2);
+	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
+			GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);
 
 
-	usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings);
+	usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings);
 	usbd_register_set_config_callback(hid_set_config);
 
 	/* delay some seconds to show that pull-up switch works */
-	{int i; for (i=0;i<0x800000;i++);}
+	{int i; for (i=0;i<0x800000;i++) asm("nop");}
 
 	/* wait for USB Vbus */
-	while(gpio_get(GPIOA, GPIO8) == 0);
+	while(gpio_get(GPIOA, GPIO8) == 0) asm("nop");
 
 	/* green LED on, connect USB */
-	gpio_set(GPIOC, GPIO13);
-	gpio_clear(GPIOC, GPIO15);
+	gpio_clear(GPIOC, GPIO2);
+	gpio_set_mode(GPIOC, GPIO_MODE_INPUT,
+		      GPIO_CNF_INPUT_FLOAT, GPIO15);
+	//gpio_clear(GPIOC, GPIO15);
 
-	while (1) 
+	while (1)
 		usbd_poll();
 }
 

From f9a28a3d5e7438842f64c123ffff2488bdccff4d Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Wed, 5 Oct 2011 13:55:17 -0700
Subject: [PATCH 05/51] Changed clock on lisa-m hid example to 72MHz and
 removed disconnect pin control as the stm32f105 has built in pullups.

---
 examples/stm32/lisa-m/usb_hid/usbhid.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.c b/examples/stm32/lisa-m/usb_hid/usbhid.c
index 414f346a..f42454bf 100644
--- a/examples/stm32/lisa-m/usb_hid/usbhid.c
+++ b/examples/stm32/lisa-m/usb_hid/usbhid.c
@@ -22,6 +22,7 @@
 #include <libopencm3/stm32/rcc.h>
 #include <libopencm3/stm32/gpio.h>
 #include <libopencm3/stm32/systick.h>
+#include <libopencm3/stm32/otg_fs.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/hid.h>
 
@@ -240,7 +241,7 @@ static void hid_set_config(u16 wValue)
 int main(void)
 {
 	int usb_connect_blink = 0;
-	rcc_clock_setup_in_hsi_out_48mhz();
+	rcc_clock_setup_in_hse_12mhz_out_72mhz();
 
 
 	rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
@@ -250,11 +251,6 @@ int main(void)
 	gpio_set_mode(GPIOA, GPIO_MODE_INPUT,
 			GPIO_CNF_INPUT_FLOAT, GPIO8);
 
-	/* disconnect USB_DISC, as output */
-	gpio_set(GPIOC, GPIO15);
-	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
-			GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);
-
 	/* green LED off, as output */
 	gpio_set(GPIOC, GPIO2);
 	gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
@@ -272,9 +268,7 @@ int main(void)
 
 	/* green LED on, connect USB */
 	gpio_clear(GPIOC, GPIO2);
-	gpio_set_mode(GPIOC, GPIO_MODE_INPUT,
-		      GPIO_CNF_INPUT_FLOAT, GPIO15);
-	//gpio_clear(GPIOC, GPIO15);
+	//OTG_FS_GCCFG &= ~OTG_FS_GCCFG_VBUSBSEN;
 
 	while (1)
 		usbd_poll();

From cbf6b8e54b526ef9c104bd9e3d9ae2e6fe3829c8 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Fri, 9 Sep 2011 10:20:23 -0700
Subject: [PATCH 06/51] Update examples Makefiles to use the make shell
 function rather than backticks for shell command expansion. Backticks are
 unreliable and don't work on all platforms.

---
 examples/lm3s/Makefile.include    | 2 +-
 examples/lpc13xx/Makefile.include | 2 +-
 examples/stm32/Makefile.include   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/lm3s/Makefile.include b/examples/lm3s/Makefile.include
index 24248325..0eafe7d3 100644
--- a/examples/lm3s/Makefile.include
+++ b/examples/lm3s/Makefile.include
@@ -25,7 +25,7 @@ LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 # Uncomment this line if you want to use the installed (not local) library.
-# TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
+# TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 TOOLCHAIN_DIR   = ../../../..
 CFLAGS		+= -O0 -g3 -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
 		   -mcpu=cortex-m3 -mthumb -MD
diff --git a/examples/lpc13xx/Makefile.include b/examples/lpc13xx/Makefile.include
index fe2c3ba0..948d6c45 100644
--- a/examples/lpc13xx/Makefile.include
+++ b/examples/lpc13xx/Makefile.include
@@ -25,7 +25,7 @@ LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 # Uncomment this line if you want to use the installed (not local) library.
-# TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
+# TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 TOOLCHAIN_DIR   = ../../../..
 CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
 		   -mcpu=cortex-m3 -mthumb -MD
diff --git a/examples/stm32/Makefile.include b/examples/stm32/Makefile.include
index a4512e9a..3e306384 100644
--- a/examples/stm32/Makefile.include
+++ b/examples/stm32/Makefile.include
@@ -26,7 +26,7 @@ OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 GDB		= $(PREFIX)-gdb
 # Uncomment this line if you want to use the installed (not local) library.
-# TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
+# TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
 TOOLCHAIN_DIR   = ../../../..
 CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
 		   -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD

From 5ba3e77246fece4883381b6db00974fd1a0c2c34 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 18:05:41 -0700
Subject: [PATCH 07/51] Adding memory map for the stm32f2 series.

---
 include/libopencm3/stm32f2/memorymap.h | 131 +++++++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 include/libopencm3/stm32f2/memorymap.h

diff --git a/include/libopencm3/stm32f2/memorymap.h b/include/libopencm3/stm32f2/memorymap.h
new file mode 100644
index 00000000..9fe77fab
--- /dev/null
+++ b/include/libopencm3/stm32f2/memorymap.h
@@ -0,0 +1,131 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_MEMORYMAP_H
+#define LIBOPENCM3_MEMORYMAP_H
+
+#include <libopencm3/cm3/memorymap.h>
+
+/* --- STM32F20x specific peripheral definitions ------------------------------- */
+
+/* Memory map for all busses */
+#define PERIPH_BASE			0x40000000
+#define PERIPH_BASE_APB1		(PERIPH_BASE + 0x00000)
+#define PERIPH_BASE_APB2		(PERIPH_BASE + 0x10000)
+#define PERIPH_BASE_AHB1		(PERIPH_BASE + 0x20000)
+#define PERIPH_BASE_AHB2		0x50000000
+#define PERIPH_BASE_AHB3		0x60000000
+
+/* Register boundary addresses */
+
+/* APB1 */
+#define TIM2_BASE			(PERIPH_BASE_APB1 + 0x0000)
+#define TIM3_BASE			(PERIPH_BASE_APB1 + 0x0400)
+#define TIM4_BASE			(PERIPH_BASE_APB1 + 0x0800)
+#define TIM5_BASE			(PERIPH_BASE_APB1 + 0x0c00)
+#define TIM6_BASE			(PERIPH_BASE_APB1 + 0x1000)
+#define TIM7_BASE			(PERIPH_BASE_APB1 + 0x1400)
+#define TIM12_BASE			(PERIPH_BASE_APB1 + 0x1800)
+#define TIM13_BASE			(PERIPH_BASE_APB1 + 0x1c00)
+#define TIM14_BASE			(PERIPH_BASE_APB1 + 0x2000)
+/* PERIPH_BASE_APB1 + 0x2400 (0x4000 2400 - 0x4000 27FF): Reserved */
+#define RTC_BASE			(PERIPH_BASE_APB1 + 0x2800)
+#define WWDG_BASE			(PERIPH_BASE_APB1 + 0x2c00)
+#define IWDG_BASE			(PERIPH_BASE_APB1 + 0x3000)
+/* PERIPH_BASE_APB1 + 0x3400 (0x4000 3400 - 0x4000 37FF): Reserved */
+#define SPI2_I2S_BASE			(PERIPH_BASE_APB1 + 0x3800)
+#define SPI3_I2S_BASE			(PERIPH_BASE_APB1 + 0x3c00)
+/* PERIPH_BASE_APB1 + 0x4000 (0x4000 4000 - 0x4000 3FFF): Reserved */
+#define USART2_BASE			(PERIPH_BASE_APB1 + 0x4400)
+#define USART3_BASE			(PERIPH_BASE_APB1 + 0x4800)
+#define UART4_BASE			(PERIPH_BASE_APB1 + 0x4c00)
+#define UART5_BASE			(PERIPH_BASE_APB1 + 0x5000)
+#define I2C1_BASE			(PERIPH_BASE_APB1 + 0x5400)
+#define I2C2_BASE			(PERIPH_BASE_APB1 + 0x5800)
+#define I2C3_BASE			(PERIPH_BASE_APB1 + 0x5C00)
+/* PERIPH_BASE_APB1 + 0x6000 (0x4000 6000 - 0x4000 63FF): Reserved */
+#define BX_CAN1_BASE			(PERIPH_BASE_APB1 + 0x6400)
+#define BX_CAN2_BASE			(PERIPH_BASE_APB1 + 0x6800)
+/* PERIPH_BASE_APB1 + 0x6C00 (0x4000 6C00 - 0x4000 6FFF): Reserved */
+#define POWER_CONTROL_BASE		(PERIPH_BASE_APB1 + 0x7000)
+#define DAC_BASE			(PERIPH_BASE_APB1 + 0x7400)
+/* PERIPH_BASE_APB1 + 0x7800 (0x4000 7800 - 0x4000 FFFF): Reserved */
+
+/* APB2 */
+#define TIM1_BASE			(PERIPH_BASE_APB2 + 0x0000)
+#define TIM8_BASE			(PERIPH_BASE_APB2 + 0x0400)
+/* PERIPH_BASE_APB2 + 0x0800 (0x4001 0800 - 0x4001 0FFF): Reserved */
+#define USART1_BASE			(PERIPH_BASE_APB2 + 0x1000)
+#define USART6_BASE			(PERIPH_BASE_APB2 + 0x1400)
+/* PERIPH_BASE_APB2 + 0x1800 (0x4001 1800 - 0x4001 1FFF): Reserved */
+#define ADC1_BASE			(PERIPH_BASE_APB2 + 0x2000)
+#define ADC2_BASE			(PERIPH_BASE_APB2 + 0x2000)
+#define ADC3_BASE			(PERIPH_BASE_APB2 + 0x2000)
+/* PERIPH_BASE_APB2 + 0x2400 (0x4001 2400 - 0x4001 27FF): Reserved */
+#define SDIO_BASE			(PERIPH_BASE_APB2 + 0x2800)
+/* PERIPH_BASE_APB2 + 0x2C00 (0x4001 2C00 - 0x4001 2FFF): Reserved */
+#define SPI1_BASE			(PERIPH_BASE_APB2 + 0x3000)
+/* PERIPH_BASE_APB2 + 0x3400 (0x4001 3400 - 0x4001 37FF): Reserved */
+#define SYSCFG_BASE			(PERIPH_BASE_APB2 + 0x3800)
+#define EXTI_BASE			(PERIPH_BASE_APB2 + 0x3C00)
+#define TIM9_BASE			(PERIPH_BASE_APB2 + 0x4000)
+#define TIM10_BASE			(PERIPH_BASE_APB2 + 0x4400)
+#define TIM11_BASE			(PERIPH_BASE_APB2 + 0x4800)
+/* PERIPH_BASE_APB2 + 0x4C00 (0x4001 4C00 - 0x4001 FFFF): Reserved */
+
+/* AHB1 */
+#define GPIO_PORT_A_BASE		(PERIPH_BASE_AHB1 + 0x0000)
+#define GPIO_PORT_B_BASE		(PERIPH_BASE_AHB1 + 0x0400)
+#define GPIO_PORT_C_BASE		(PERIPH_BASE_AHB1 + 0x0800)
+#define GPIO_PORT_D_BASE		(PERIPH_BASE_AHB1 + 0x0C00)
+#define GPIO_PORT_E_BASE		(PERIPH_BASE_AHB1 + 0x1000)
+#define GPIO_PORT_F_BASE		(PERIPH_BASE_AHB1 + 0x1400)
+#define GPIO_PORT_G_BASE		(PERIPH_BASE_AHB1 + 0x1800)
+#define GPIO_PORT_H_BASE		(PERIPH_BASE_AHB1 + 0x1C00)
+#define GPIO_PORT_I_BASE		(PERIPH_BASE_AHB1 + 0x2000)
+/* PERIPH_BASE_AHB1 + 0x2400 (0x4002 2400 - 0x4002 2FFF): Reserved */
+#define CRC_BASE			(PERIPH_BASE_AHB1 + 0x3000)
+/* PERIPH_BASE_AHB1 + 0x3400 (0x4002 3400 - 0x4002 37FF): Reserved */
+#define RCC_BASE			(PERIPH_BASE_AHB1 + 0x3800)
+#define FLASH_MEM_INTERFACE_BASE	(PERIPH_BASE_AHB1 + 0x3C00)
+#define BKPSRAM_BASE	(PERIPH_BASE_AHB1 + 0x4000)
+/* PERIPH_BASE_AHB1 + 0x5000 (0x4002 5000 - 0x4002 5FFF): Reserved */
+#define DMA1_BASE			(PERIPH_BASE_AHB1 + 0x6000)
+#define DMA2_BASE			(PERIPH_BASE_AHB1 + 0x6400)
+/* PERIPH_BASE_AHB1 + 0x6800 (0x4002 6800 - 0x4002 7FFF): Reserved */
+#define ETHERNET_BASE			(PERIPH_BASE_AHB1 + 0x8000)
+/* PERIPH_BASE_AHB1 + 0x9400 (0x4002 9400 - 0x4003 FFFF): Reserved */
+#define USB_OTG_HS_BASE			(PERIPH_BASE_AHB1 + 0x20000)
+/* PERIPH_BASE_AHB1 + 0x60000 (0x4008 0000 - 0x4FFF FFFF): Reserved */
+
+/* AHB2 */
+#define USB_OTG_FS_BASE			(PERIPH_BASE_AHB2 + 0x0000)
+/* PERIPH_BASE_AHB2 + 0x40000 (0x5004 0000 - 0x5004 FFFF): Reserved */
+#define DCMI_BASE			(PERIPH_BASE_AHB2 + 0x50000)
+/* PERIPH_BASE_AHB2 + 0x50400 (0x5005 0400 - 0x5006 07FF): Reserved */
+#define RNG_BASE			(PERIPH_BASE_AHB2 + 0x60800)
+/* PERIPH_BASE_AHB2 + 0x61000 (0x5006 1000 - 0x5FFF FFFF): Reserved */
+
+/* AHB3 */
+#define FSMC_BASE			(PERIPH_BASE_AHB3 + 0x40000000)
+
+/* PPIB */
+#define DBGMCU_BASE			(PPBI_BASE + 0x00042000)
+
+#endif

From 18648708c887e24a1e30a37b133aad15b284a21d Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 18:09:10 -0700
Subject: [PATCH 08/51] Moving renaming stm32 header files for f1 series.

---
 include/libopencm3/{stm32 => stm32f1}/adc.h       | 0
 include/libopencm3/{stm32 => stm32f1}/bkp.h       | 0
 include/libopencm3/{stm32 => stm32f1}/can.h       | 0
 include/libopencm3/{stm32 => stm32f1}/crc.h       | 0
 include/libopencm3/{stm32 => stm32f1}/dbgmcu.h    | 0
 include/libopencm3/{stm32 => stm32f1}/dma.h       | 0
 include/libopencm3/{stm32 => stm32f1}/ethernet.h  | 0
 include/libopencm3/{stm32 => stm32f1}/exti.h      | 0
 include/libopencm3/{stm32 => stm32f1}/flash.h     | 0
 include/libopencm3/{stm32 => stm32f1}/fsmc.h      | 0
 include/libopencm3/{stm32 => stm32f1}/gpio.h      | 0
 include/libopencm3/{stm32 => stm32f1}/i2c.h       | 0
 include/libopencm3/{stm32 => stm32f1}/iwdg.h      | 0
 include/libopencm3/{stm32 => stm32f1}/memorymap.h | 0
 include/libopencm3/{stm32 => stm32f1}/nvic.h      | 0
 include/libopencm3/{stm32 => stm32f1}/otg_fs.h    | 0
 include/libopencm3/{stm32 => stm32f1}/pwr.h       | 0
 include/libopencm3/{stm32 => stm32f1}/rcc.h       | 0
 include/libopencm3/{stm32 => stm32f1}/rtc.h       | 0
 include/libopencm3/{stm32 => stm32f1}/scb.h       | 0
 include/libopencm3/{stm32 => stm32f1}/spi.h       | 0
 include/libopencm3/{stm32 => stm32f1}/systick.h   | 0
 include/libopencm3/{stm32 => stm32f1}/timer.h     | 0
 include/libopencm3/{stm32 => stm32f1}/tools.h     | 0
 include/libopencm3/{stm32 => stm32f1}/usart.h     | 0
 include/libopencm3/{stm32 => stm32f1}/usb.h       | 0
 include/libopencm3/{stm32 => stm32f1}/usb_desc.h  | 0
 include/libopencm3/{stm32 => stm32f1}/wwdg.h      | 0
 28 files changed, 0 insertions(+), 0 deletions(-)
 rename include/libopencm3/{stm32 => stm32f1}/adc.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/bkp.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/can.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/crc.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/dbgmcu.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/dma.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/ethernet.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/exti.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/flash.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/fsmc.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/gpio.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/i2c.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/iwdg.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/memorymap.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/nvic.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/otg_fs.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/pwr.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/rcc.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/rtc.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/scb.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/spi.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/systick.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/timer.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/tools.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/usart.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/usb.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/usb_desc.h (100%)
 rename include/libopencm3/{stm32 => stm32f1}/wwdg.h (100%)

diff --git a/include/libopencm3/stm32/adc.h b/include/libopencm3/stm32f1/adc.h
similarity index 100%
rename from include/libopencm3/stm32/adc.h
rename to include/libopencm3/stm32f1/adc.h
diff --git a/include/libopencm3/stm32/bkp.h b/include/libopencm3/stm32f1/bkp.h
similarity index 100%
rename from include/libopencm3/stm32/bkp.h
rename to include/libopencm3/stm32f1/bkp.h
diff --git a/include/libopencm3/stm32/can.h b/include/libopencm3/stm32f1/can.h
similarity index 100%
rename from include/libopencm3/stm32/can.h
rename to include/libopencm3/stm32f1/can.h
diff --git a/include/libopencm3/stm32/crc.h b/include/libopencm3/stm32f1/crc.h
similarity index 100%
rename from include/libopencm3/stm32/crc.h
rename to include/libopencm3/stm32f1/crc.h
diff --git a/include/libopencm3/stm32/dbgmcu.h b/include/libopencm3/stm32f1/dbgmcu.h
similarity index 100%
rename from include/libopencm3/stm32/dbgmcu.h
rename to include/libopencm3/stm32f1/dbgmcu.h
diff --git a/include/libopencm3/stm32/dma.h b/include/libopencm3/stm32f1/dma.h
similarity index 100%
rename from include/libopencm3/stm32/dma.h
rename to include/libopencm3/stm32f1/dma.h
diff --git a/include/libopencm3/stm32/ethernet.h b/include/libopencm3/stm32f1/ethernet.h
similarity index 100%
rename from include/libopencm3/stm32/ethernet.h
rename to include/libopencm3/stm32f1/ethernet.h
diff --git a/include/libopencm3/stm32/exti.h b/include/libopencm3/stm32f1/exti.h
similarity index 100%
rename from include/libopencm3/stm32/exti.h
rename to include/libopencm3/stm32f1/exti.h
diff --git a/include/libopencm3/stm32/flash.h b/include/libopencm3/stm32f1/flash.h
similarity index 100%
rename from include/libopencm3/stm32/flash.h
rename to include/libopencm3/stm32f1/flash.h
diff --git a/include/libopencm3/stm32/fsmc.h b/include/libopencm3/stm32f1/fsmc.h
similarity index 100%
rename from include/libopencm3/stm32/fsmc.h
rename to include/libopencm3/stm32f1/fsmc.h
diff --git a/include/libopencm3/stm32/gpio.h b/include/libopencm3/stm32f1/gpio.h
similarity index 100%
rename from include/libopencm3/stm32/gpio.h
rename to include/libopencm3/stm32f1/gpio.h
diff --git a/include/libopencm3/stm32/i2c.h b/include/libopencm3/stm32f1/i2c.h
similarity index 100%
rename from include/libopencm3/stm32/i2c.h
rename to include/libopencm3/stm32f1/i2c.h
diff --git a/include/libopencm3/stm32/iwdg.h b/include/libopencm3/stm32f1/iwdg.h
similarity index 100%
rename from include/libopencm3/stm32/iwdg.h
rename to include/libopencm3/stm32f1/iwdg.h
diff --git a/include/libopencm3/stm32/memorymap.h b/include/libopencm3/stm32f1/memorymap.h
similarity index 100%
rename from include/libopencm3/stm32/memorymap.h
rename to include/libopencm3/stm32f1/memorymap.h
diff --git a/include/libopencm3/stm32/nvic.h b/include/libopencm3/stm32f1/nvic.h
similarity index 100%
rename from include/libopencm3/stm32/nvic.h
rename to include/libopencm3/stm32f1/nvic.h
diff --git a/include/libopencm3/stm32/otg_fs.h b/include/libopencm3/stm32f1/otg_fs.h
similarity index 100%
rename from include/libopencm3/stm32/otg_fs.h
rename to include/libopencm3/stm32f1/otg_fs.h
diff --git a/include/libopencm3/stm32/pwr.h b/include/libopencm3/stm32f1/pwr.h
similarity index 100%
rename from include/libopencm3/stm32/pwr.h
rename to include/libopencm3/stm32f1/pwr.h
diff --git a/include/libopencm3/stm32/rcc.h b/include/libopencm3/stm32f1/rcc.h
similarity index 100%
rename from include/libopencm3/stm32/rcc.h
rename to include/libopencm3/stm32f1/rcc.h
diff --git a/include/libopencm3/stm32/rtc.h b/include/libopencm3/stm32f1/rtc.h
similarity index 100%
rename from include/libopencm3/stm32/rtc.h
rename to include/libopencm3/stm32f1/rtc.h
diff --git a/include/libopencm3/stm32/scb.h b/include/libopencm3/stm32f1/scb.h
similarity index 100%
rename from include/libopencm3/stm32/scb.h
rename to include/libopencm3/stm32f1/scb.h
diff --git a/include/libopencm3/stm32/spi.h b/include/libopencm3/stm32f1/spi.h
similarity index 100%
rename from include/libopencm3/stm32/spi.h
rename to include/libopencm3/stm32f1/spi.h
diff --git a/include/libopencm3/stm32/systick.h b/include/libopencm3/stm32f1/systick.h
similarity index 100%
rename from include/libopencm3/stm32/systick.h
rename to include/libopencm3/stm32f1/systick.h
diff --git a/include/libopencm3/stm32/timer.h b/include/libopencm3/stm32f1/timer.h
similarity index 100%
rename from include/libopencm3/stm32/timer.h
rename to include/libopencm3/stm32f1/timer.h
diff --git a/include/libopencm3/stm32/tools.h b/include/libopencm3/stm32f1/tools.h
similarity index 100%
rename from include/libopencm3/stm32/tools.h
rename to include/libopencm3/stm32f1/tools.h
diff --git a/include/libopencm3/stm32/usart.h b/include/libopencm3/stm32f1/usart.h
similarity index 100%
rename from include/libopencm3/stm32/usart.h
rename to include/libopencm3/stm32f1/usart.h
diff --git a/include/libopencm3/stm32/usb.h b/include/libopencm3/stm32f1/usb.h
similarity index 100%
rename from include/libopencm3/stm32/usb.h
rename to include/libopencm3/stm32f1/usb.h
diff --git a/include/libopencm3/stm32/usb_desc.h b/include/libopencm3/stm32f1/usb_desc.h
similarity index 100%
rename from include/libopencm3/stm32/usb_desc.h
rename to include/libopencm3/stm32f1/usb_desc.h
diff --git a/include/libopencm3/stm32/wwdg.h b/include/libopencm3/stm32f1/wwdg.h
similarity index 100%
rename from include/libopencm3/stm32/wwdg.h
rename to include/libopencm3/stm32f1/wwdg.h

From cf8171e469ff726701bfdc5d14a169c87d1e5b54 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 18:12:11 -0700
Subject: [PATCH 09/51] Moving stm header files that are common to f1 and f2
 series into their own folder.

---
 include/libopencm3/{stm32f1 => stm32_common}/can.h    | 0
 include/libopencm3/{stm32f1 => stm32_common}/crc.h    | 0
 include/libopencm3/{stm32f1 => stm32_common}/dbgmcu.h | 0
 include/libopencm3/{stm32f1 => stm32_common}/exti.h   | 0
 include/libopencm3/{stm32f1 => stm32_common}/fsmc.h   | 0
 include/libopencm3/{stm32f1 => stm32_common}/iwdg.h   | 0
 include/libopencm3/{stm32f1 => stm32_common}/wwdg.h   | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename include/libopencm3/{stm32f1 => stm32_common}/can.h (100%)
 rename include/libopencm3/{stm32f1 => stm32_common}/crc.h (100%)
 rename include/libopencm3/{stm32f1 => stm32_common}/dbgmcu.h (100%)
 rename include/libopencm3/{stm32f1 => stm32_common}/exti.h (100%)
 rename include/libopencm3/{stm32f1 => stm32_common}/fsmc.h (100%)
 rename include/libopencm3/{stm32f1 => stm32_common}/iwdg.h (100%)
 rename include/libopencm3/{stm32f1 => stm32_common}/wwdg.h (100%)

diff --git a/include/libopencm3/stm32f1/can.h b/include/libopencm3/stm32_common/can.h
similarity index 100%
rename from include/libopencm3/stm32f1/can.h
rename to include/libopencm3/stm32_common/can.h
diff --git a/include/libopencm3/stm32f1/crc.h b/include/libopencm3/stm32_common/crc.h
similarity index 100%
rename from include/libopencm3/stm32f1/crc.h
rename to include/libopencm3/stm32_common/crc.h
diff --git a/include/libopencm3/stm32f1/dbgmcu.h b/include/libopencm3/stm32_common/dbgmcu.h
similarity index 100%
rename from include/libopencm3/stm32f1/dbgmcu.h
rename to include/libopencm3/stm32_common/dbgmcu.h
diff --git a/include/libopencm3/stm32f1/exti.h b/include/libopencm3/stm32_common/exti.h
similarity index 100%
rename from include/libopencm3/stm32f1/exti.h
rename to include/libopencm3/stm32_common/exti.h
diff --git a/include/libopencm3/stm32f1/fsmc.h b/include/libopencm3/stm32_common/fsmc.h
similarity index 100%
rename from include/libopencm3/stm32f1/fsmc.h
rename to include/libopencm3/stm32_common/fsmc.h
diff --git a/include/libopencm3/stm32f1/iwdg.h b/include/libopencm3/stm32_common/iwdg.h
similarity index 100%
rename from include/libopencm3/stm32f1/iwdg.h
rename to include/libopencm3/stm32_common/iwdg.h
diff --git a/include/libopencm3/stm32f1/wwdg.h b/include/libopencm3/stm32_common/wwdg.h
similarity index 100%
rename from include/libopencm3/stm32f1/wwdg.h
rename to include/libopencm3/stm32_common/wwdg.h

From 424b094ce83e6c9ae577cef22e86054cc2d945a5 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 18:25:11 -0700
Subject: [PATCH 10/51] Renaming lib code for stm32 f1 series.

---
 lib/{stm32 => stm32f1}/Makefile                                  | 0
 lib/{stm32 => stm32f1}/adc.c                                     | 0
 lib/{stm32 => stm32f1}/can.c                                     | 0
 lib/{stm32 => stm32f1}/dma.c                                     | 0
 lib/{stm32 => stm32f1}/ethernet.c                                | 0
 lib/{stm32 => stm32f1}/exti.c                                    | 0
 lib/{stm32 => stm32f1}/flash.c                                   | 0
 lib/{stm32 => stm32f1}/gpio.c                                    | 0
 lib/{stm32 => stm32f1}/i2c.c                                     | 0
 lib/{stm32/libopencm3_stm32.ld => stm32f1/libopencm3_stm32f1.ld} | 0
 lib/{stm32 => stm32f1}/nvic.c                                    | 0
 lib/{stm32 => stm32f1}/rcc.c                                     | 0
 lib/{stm32 => stm32f1}/rtc.c                                     | 0
 lib/{stm32 => stm32f1}/scb.c                                     | 0
 lib/{stm32 => stm32f1}/spi.c                                     | 0
 lib/{stm32 => stm32f1}/systick.c                                 | 0
 lib/{stm32 => stm32f1}/timer.c                                   | 0
 lib/{stm32 => stm32f1}/usart.c                                   | 0
 lib/{stm32 => stm32f1}/vector.c                                  | 0
 19 files changed, 0 insertions(+), 0 deletions(-)
 rename lib/{stm32 => stm32f1}/Makefile (100%)
 rename lib/{stm32 => stm32f1}/adc.c (100%)
 rename lib/{stm32 => stm32f1}/can.c (100%)
 rename lib/{stm32 => stm32f1}/dma.c (100%)
 rename lib/{stm32 => stm32f1}/ethernet.c (100%)
 rename lib/{stm32 => stm32f1}/exti.c (100%)
 rename lib/{stm32 => stm32f1}/flash.c (100%)
 rename lib/{stm32 => stm32f1}/gpio.c (100%)
 rename lib/{stm32 => stm32f1}/i2c.c (100%)
 rename lib/{stm32/libopencm3_stm32.ld => stm32f1/libopencm3_stm32f1.ld} (100%)
 rename lib/{stm32 => stm32f1}/nvic.c (100%)
 rename lib/{stm32 => stm32f1}/rcc.c (100%)
 rename lib/{stm32 => stm32f1}/rtc.c (100%)
 rename lib/{stm32 => stm32f1}/scb.c (100%)
 rename lib/{stm32 => stm32f1}/spi.c (100%)
 rename lib/{stm32 => stm32f1}/systick.c (100%)
 rename lib/{stm32 => stm32f1}/timer.c (100%)
 rename lib/{stm32 => stm32f1}/usart.c (100%)
 rename lib/{stm32 => stm32f1}/vector.c (100%)

diff --git a/lib/stm32/Makefile b/lib/stm32f1/Makefile
similarity index 100%
rename from lib/stm32/Makefile
rename to lib/stm32f1/Makefile
diff --git a/lib/stm32/adc.c b/lib/stm32f1/adc.c
similarity index 100%
rename from lib/stm32/adc.c
rename to lib/stm32f1/adc.c
diff --git a/lib/stm32/can.c b/lib/stm32f1/can.c
similarity index 100%
rename from lib/stm32/can.c
rename to lib/stm32f1/can.c
diff --git a/lib/stm32/dma.c b/lib/stm32f1/dma.c
similarity index 100%
rename from lib/stm32/dma.c
rename to lib/stm32f1/dma.c
diff --git a/lib/stm32/ethernet.c b/lib/stm32f1/ethernet.c
similarity index 100%
rename from lib/stm32/ethernet.c
rename to lib/stm32f1/ethernet.c
diff --git a/lib/stm32/exti.c b/lib/stm32f1/exti.c
similarity index 100%
rename from lib/stm32/exti.c
rename to lib/stm32f1/exti.c
diff --git a/lib/stm32/flash.c b/lib/stm32f1/flash.c
similarity index 100%
rename from lib/stm32/flash.c
rename to lib/stm32f1/flash.c
diff --git a/lib/stm32/gpio.c b/lib/stm32f1/gpio.c
similarity index 100%
rename from lib/stm32/gpio.c
rename to lib/stm32f1/gpio.c
diff --git a/lib/stm32/i2c.c b/lib/stm32f1/i2c.c
similarity index 100%
rename from lib/stm32/i2c.c
rename to lib/stm32f1/i2c.c
diff --git a/lib/stm32/libopencm3_stm32.ld b/lib/stm32f1/libopencm3_stm32f1.ld
similarity index 100%
rename from lib/stm32/libopencm3_stm32.ld
rename to lib/stm32f1/libopencm3_stm32f1.ld
diff --git a/lib/stm32/nvic.c b/lib/stm32f1/nvic.c
similarity index 100%
rename from lib/stm32/nvic.c
rename to lib/stm32f1/nvic.c
diff --git a/lib/stm32/rcc.c b/lib/stm32f1/rcc.c
similarity index 100%
rename from lib/stm32/rcc.c
rename to lib/stm32f1/rcc.c
diff --git a/lib/stm32/rtc.c b/lib/stm32f1/rtc.c
similarity index 100%
rename from lib/stm32/rtc.c
rename to lib/stm32f1/rtc.c
diff --git a/lib/stm32/scb.c b/lib/stm32f1/scb.c
similarity index 100%
rename from lib/stm32/scb.c
rename to lib/stm32f1/scb.c
diff --git a/lib/stm32/spi.c b/lib/stm32f1/spi.c
similarity index 100%
rename from lib/stm32/spi.c
rename to lib/stm32f1/spi.c
diff --git a/lib/stm32/systick.c b/lib/stm32f1/systick.c
similarity index 100%
rename from lib/stm32/systick.c
rename to lib/stm32f1/systick.c
diff --git a/lib/stm32/timer.c b/lib/stm32f1/timer.c
similarity index 100%
rename from lib/stm32/timer.c
rename to lib/stm32f1/timer.c
diff --git a/lib/stm32/usart.c b/lib/stm32f1/usart.c
similarity index 100%
rename from lib/stm32/usart.c
rename to lib/stm32f1/usart.c
diff --git a/lib/stm32/vector.c b/lib/stm32f1/vector.c
similarity index 100%
rename from lib/stm32/vector.c
rename to lib/stm32f1/vector.c

From 76700510e08007fcbb461c22e71649bfa2bf95de Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 20:48:41 -0700
Subject: [PATCH 11/51] Ability to choose memorymap for stm_common headers with
 define.

---
 include/libopencm3/stm32_common/can.h       |  2 +-
 include/libopencm3/stm32_common/crc.h       |  2 +-
 include/libopencm3/stm32_common/dbgmcu.h    |  2 +-
 include/libopencm3/stm32_common/exti.h      |  2 +-
 include/libopencm3/stm32_common/fsmc.h      |  2 +-
 include/libopencm3/stm32_common/iwdg.h      |  2 +-
 include/libopencm3/stm32_common/memorymap.h | 35 +++++++++++++++++++++
 include/libopencm3/stm32_common/wwdg.h      |  2 +-
 8 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 include/libopencm3/stm32_common/memorymap.h

diff --git a/include/libopencm3/stm32_common/can.h b/include/libopencm3/stm32_common/can.h
index 1aa95a17..eeac5d80 100644
--- a/include/libopencm3/stm32_common/can.h
+++ b/include/libopencm3/stm32_common/can.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_CAN_H
 #define LIBOPENCM3_CAN_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/crc.h b/include/libopencm3/stm32_common/crc.h
index 5ad866e6..a5bc35a5 100644
--- a/include/libopencm3/stm32_common/crc.h
+++ b/include/libopencm3/stm32_common/crc.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_CRC_H
 #define LIBOPENCM3_CRC_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- CRC registers ------------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/dbgmcu.h b/include/libopencm3/stm32_common/dbgmcu.h
index e753f5ed..e6771a26 100644
--- a/include/libopencm3/stm32_common/dbgmcu.h
+++ b/include/libopencm3/stm32_common/dbgmcu.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_STM32_DBGMCU_H
 #define LIBOPENCM3_STM32_DBGMCU_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- DBGMCU registers ---------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/exti.h b/include/libopencm3/stm32_common/exti.h
index 19ab5472..caecee5d 100644
--- a/include/libopencm3/stm32_common/exti.h
+++ b/include/libopencm3/stm32_common/exti.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_EXTI_H
 #define LIBOPENCM3_EXTI_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- EXTI registers ------------------------------------------------------ */
diff --git a/include/libopencm3/stm32_common/fsmc.h b/include/libopencm3/stm32_common/fsmc.h
index 1d318e31..5ccd1d1f 100644
--- a/include/libopencm3/stm32_common/fsmc.h
+++ b/include/libopencm3/stm32_common/fsmc.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_FSMC_H
 #define LIBOPENCM3_FSMC_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/iwdg.h b/include/libopencm3/stm32_common/iwdg.h
index bf2784ab..67f29610 100644
--- a/include/libopencm3/stm32_common/iwdg.h
+++ b/include/libopencm3/stm32_common/iwdg.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_IWDG_H
 #define LIBOPENCM3_IWDG_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- IWDG registers ------------------------------------------------------ */
diff --git a/include/libopencm3/stm32_common/memorymap.h b/include/libopencm3/stm32_common/memorymap.h
new file mode 100644
index 00000000..0d0c60fb
--- /dev/null
+++ b/include/libopencm3/stm32_common/memorymap.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_MEMORYMAP_COMMON_H
+#define LIBOPENCM3_MEMORYMAP_COMMON_H
+
+#include <libopencm3/cm3/memorymap.h>
+
+#ifdef STM32F1
+#include <libopencm3/stm32f1/memorymap.h>
+#else
+#ifdef STM32F1
+#include <libopencm3/stm32f2/memorymap.h>
+#else
+#error "stm32 family not defined."
+#endif
+#endif
+
+#endif
diff --git a/include/libopencm3/stm32_common/wwdg.h b/include/libopencm3/stm32_common/wwdg.h
index 552d02ed..e1787c86 100644
--- a/include/libopencm3/stm32_common/wwdg.h
+++ b/include/libopencm3/stm32_common/wwdg.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_WWDG_H
 #define LIBOPENCM3_WWDG_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- WWDG registers ------------------------------------------------------ */

From e77bbff125d603f31899f505242577cca9ca7b43 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 20:48:56 -0700
Subject: [PATCH 12/51] Fixing small typo.

---
 include/libopencm3/stm32f1/spi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/libopencm3/stm32f1/spi.h b/include/libopencm3/stm32f1/spi.h
index 726310a1..d85c0dcb 100644
--- a/include/libopencm3/stm32f1/spi.h
+++ b/include/libopencm3/stm32f1/spi.h
@@ -160,7 +160,7 @@
 #define SPI_CR1_CPHA_CLK_TRANSITION_2	(1 << 0)
 #define SPI_CR1_CPHA			(1 << 0)
 
-/* --- SPI_CR1 values ------------------------------------------------------ */
+/* --- SPI_CR2 values ------------------------------------------------------ */
 
 /* Bits [15:8]: Reserved. Forced to 0 by hardware. */
 

From 6bf33af01070a7559bd5a129f5a4cde7f7e6151a Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 20:49:43 -0700
Subject: [PATCH 13/51] Moved pwr.h to stm_common and added F2 series specific
 extensions in its own header.

---
 .../{stm32f1 => stm32_common}/pwr.h           |  2 +-
 include/libopencm3/stm32f2/pwr.h              | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 rename include/libopencm3/{stm32f1 => stm32_common}/pwr.h (97%)
 create mode 100644 include/libopencm3/stm32f2/pwr.h

diff --git a/include/libopencm3/stm32f1/pwr.h b/include/libopencm3/stm32_common/pwr.h
similarity index 97%
rename from include/libopencm3/stm32f1/pwr.h
rename to include/libopencm3/stm32_common/pwr.h
index e5b98042..4af84804 100644
--- a/include/libopencm3/stm32f1/pwr.h
+++ b/include/libopencm3/stm32_common/pwr.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_PWR_H
 #define LIBOPENCM3_PWR_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- PWR registers ------------------------------------------------------- */
diff --git a/include/libopencm3/stm32f2/pwr.h b/include/libopencm3/stm32f2/pwr.h
new file mode 100644
index 00000000..8e8517ee
--- /dev/null
+++ b/include/libopencm3/stm32f2/pwr.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_PWR_F2_H
+#define LIBOPENCM3_PWR_F2_H
+
+#include <libopencm3/stm32_common/pwr.h>
+#include <libopencm3/cm3/common.h>
+
+
+/*
+ * This file extends the version in stm_common with definitions only
+ * applicable to the STM32F2 series of devices.
+ */
+
+/* --- PWR_CR values ------------------------------------------------------- */
+
+/* FPDS: Flash power down in stop mode, only available in F2 family devices. */
+#define PWR_CR_FPDS			(1 << 9)
+
+/* --- PWR_CSR values ------------------------------------------------------ */
+
+/* BRE: Backup regulator enable */
+#define PWR_CSR_BRE			(1 << 9)
+
+#endif

From ac18a048696a675cc05acec91a6686164e0df29f Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 21:11:09 -0700
Subject: [PATCH 14/51] Moved spi header over to common and created F2 specific
 header.

---
 .../{stm32f1 => stm32_common}/spi.h           |  4 +-
 include/libopencm3/stm32f2/spi.h              | 42 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)
 rename include/libopencm3/{stm32f1 => stm32_common}/spi.h (98%)
 create mode 100644 include/libopencm3/stm32f2/spi.h

diff --git a/include/libopencm3/stm32f1/spi.h b/include/libopencm3/stm32_common/spi.h
similarity index 98%
rename from include/libopencm3/stm32f1/spi.h
rename to include/libopencm3/stm32_common/spi.h
index d85c0dcb..32494570 100644
--- a/include/libopencm3/stm32f1/spi.h
+++ b/include/libopencm3/stm32_common/spi.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_SPI_H
 #define LIBOPENCM3_SPI_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* Registers can be accessed as 16bit or 32bit values. */
@@ -212,7 +212,7 @@
 /* RXNE: Receive buffer not empty */
 #define SPI_SR_RXNE			(1 << 0)
 
-/* --- SPI_SR values ------------------------------------------------------- */
+/* --- SPI_DR values ------------------------------------------------------- */
 
 /* SPI_DR[15:0]: Data Register. */
 
diff --git a/include/libopencm3/stm32f2/spi.h b/include/libopencm3/stm32f2/spi.h
new file mode 100644
index 00000000..d4aa02ed
--- /dev/null
+++ b/include/libopencm3/stm32f2/spi.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_SPI_F2_H
+#define LIBOPENCM3_SPI_F2_H
+
+#include <libopencm3/stm32_common/spi.h>
+
+/*
+ * This file extends the version in stm_common with definitions only
+ * applicable to the STM32F2 series of devices.
+ */
+
+/* --- SPI_CR2 values ------------------------------------------------------ */
+
+/* FRF: Frame format. */
+#define SPI_CR2_FRF			(1 << 4)
+#define SPI_CR2_FRF_TI		       	(1 << 4)
+#define SPI_CR2_FRF_MOTOROLA			(1 << 4)
+
+/* --- SPI_SR values ------------------------------------------------------- */
+
+/* TIFRFE: TI frame format error. */
+#define SPI_SR_RXNE			(1 << 0)
+
+#endif

From ab871dde0b3d9fa6ada9dfe42a71e5ca94589a70 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 21:11:24 -0700
Subject: [PATCH 15/51] Unnecessary include removed.

---
 include/libopencm3/stm32f2/pwr.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/libopencm3/stm32f2/pwr.h b/include/libopencm3/stm32f2/pwr.h
index 8e8517ee..49b33834 100644
--- a/include/libopencm3/stm32f2/pwr.h
+++ b/include/libopencm3/stm32f2/pwr.h
@@ -21,8 +21,6 @@
 #define LIBOPENCM3_PWR_F2_H
 
 #include <libopencm3/stm32_common/pwr.h>
-#include <libopencm3/cm3/common.h>
-
 
 /*
  * This file extends the version in stm_common with definitions only

From 69fb967eed15dfde14442ecfa36e42f824b704c2 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 22:13:55 -0700
Subject: [PATCH 16/51] Moves usart over to common and added F2 specific
 header.

---
 .../{stm32f1 => stm32_common}/usart.h         |  2 +-
 include/libopencm3/stm32f2/usart.h            | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 rename include/libopencm3/{stm32f1 => stm32_common}/usart.h (99%)
 create mode 100644 include/libopencm3/stm32f2/usart.h

diff --git a/include/libopencm3/stm32f1/usart.h b/include/libopencm3/stm32_common/usart.h
similarity index 99%
rename from include/libopencm3/stm32f1/usart.h
rename to include/libopencm3/stm32_common/usart.h
index df6bc089..0a1ed363 100644
--- a/include/libopencm3/stm32f1/usart.h
+++ b/include/libopencm3/stm32_common/usart.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_USART_H
 #define LIBOPENCM3_USART_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32f2/usart.h b/include/libopencm3/stm32f2/usart.h
new file mode 100644
index 00000000..8d1cacac
--- /dev/null
+++ b/include/libopencm3/stm32f2/usart.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_USART_F2_H
+#define LIBOPENCM3_USART_F2_H
+
+#include <libopencm3/stm32_common/usart.h>
+
+/* --- USART_CR1 values ---------------------------------------------------- */
+
+/* OVER8: Oversampling mode */
+#define USART_CR1_OVER8			(1 << 15)
+
+/* --- USART_CR3 values ---------------------------------------------------- */
+
+/* ONEBIT: One sample bit method enable */
+#define USART_CR3_ONEBIT			(1 << 11)
+
+#endif

From fd2eb7a1bd3b7cbe06dd91fad6782a85afff86ba Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 12 Sep 2011 23:28:52 -0700
Subject: [PATCH 17/51] Moved I2C to common, no changes needed.

---
 include/libopencm3/{stm32f1 => stm32_common}/i2c.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename include/libopencm3/{stm32f1 => stm32_common}/i2c.h (98%)

diff --git a/include/libopencm3/stm32f1/i2c.h b/include/libopencm3/stm32_common/i2c.h
similarity index 98%
rename from include/libopencm3/stm32f1/i2c.h
rename to include/libopencm3/stm32_common/i2c.h
index 1b837b87..1fa4f372 100644
--- a/include/libopencm3/stm32f1/i2c.h
+++ b/include/libopencm3/stm32_common/i2c.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_I2C_H
 #define LIBOPENCM3_I2C_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
@@ -195,7 +195,7 @@
 
 /* ADD: Address bits: [7:1] in 7-bit mode, bits [9:0] in 10-bit mode */
 
-/* --- I2Cx_OAR1 values ---------------------------------------------------- */
+/* --- I2Cx_OAR2 values ---------------------------------------------------- */
 
 /* Note: Bits [15:8] are reserved, and forced to 0 by hardware. */
 

From 0d4931f91feba0f2e99b58b6b18345696e390b7a Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Tue, 13 Sep 2011 18:39:44 -0700
Subject: [PATCH 18/51] Moved timer stuff to common and added F2 specific
 header.

---
 .../{stm32f1 => stm32_common}/timer.h         |  2 +-
 include/libopencm3/stm32f2/timer.h            | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 rename include/libopencm3/{stm32f1 => stm32_common}/timer.h (99%)
 create mode 100644 include/libopencm3/stm32f2/timer.h

diff --git a/include/libopencm3/stm32f1/timer.h b/include/libopencm3/stm32_common/timer.h
similarity index 99%
rename from include/libopencm3/stm32f1/timer.h
rename to include/libopencm3/stm32_common/timer.h
index 7b5df860..c1eac99a 100644
--- a/include/libopencm3/stm32f1/timer.h
+++ b/include/libopencm3/stm32_common/timer.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_TIMER_H
 #define LIBOPENCM3_TIMER_H
 
-#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32_common/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32f2/timer.h b/include/libopencm3/stm32f2/timer.h
new file mode 100644
index 00000000..f7c82aef
--- /dev/null
+++ b/include/libopencm3/stm32f2/timer.h
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_TIMER_F2_H
+#define LIBOPENCM3_TIMER_F2_H
+
+#include <libopencm3/stm32/timer.h>
+
+
+/* 
+ * TIM2 and TIM5 are now 32bit and the following registers are now 32-bit wide:
+ * CNT, ARR, CCR1, CCR2, CCR3, CCR4
+ */
+
+/* Timer 2/5 option register (TIMx_OR) */
+#define TIM_OR(tim_base)              MMIO32(tim_base + 0x50)
+#define TIM2_OR                       TIM_OR(TIM2)
+#define TIM5_OR                       TIM_OR(TIM5)
+
+/* --- TIM2_OR values ---------------------------------------------------- */
+
+/* MOE: Main output enable */
+#define TIM2_OR_ITR1_RMP_TIM8_TRGOUT    (0x0 << 10)
+#define TIM2_OR_ITR1_RMP_PTP            (0x1 << 10)
+#define TIM2_OR_ITR1_RMP_OTG_FS_SOF     (0x2 << 10)
+#define TIM2_OR_ITR1_RMP_OTG_HS_SOF     (0x3 << 10)
+#define TIM2_OR_ITR1_RMP_MASK           (0x3 << 10)
+
+/* --- TIM5_OR values ---------------------------------------------------- */
+
+/* MOE: Main output enable */
+#define TIM5_OR_TI4_RMP_GPIO    (0x0 << 6)
+#define TIM5_OR_TI4_RMP_LSI     (0x1 << 6)
+#define TIM5_OR_TI4_RMP_LSE     (0x2 << 6)
+#define TIM5_OR_TI4_RMP_RTC     (0x3 << 6)
+#define TIM5_OR_TI4_RMP_MASK    (0x3 << 6)
+
+#endif

From 4eff339e8caae6a16b3650343de483201d4ca490 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Wed, 14 Sep 2011 13:47:33 -0700
Subject: [PATCH 19/51] Restructuring stm32 include directories.

---
 include/libopencm3/{stm32_common => stm32}/can.h       | 2 +-
 include/libopencm3/{stm32_common => stm32}/crc.h       | 2 +-
 include/libopencm3/{stm32_common => stm32}/dbgmcu.h    | 2 +-
 include/libopencm3/{stm32_common => stm32}/exti.h      | 2 +-
 include/libopencm3/{stm32f1 => stm32/f1}/adc.h         | 0
 include/libopencm3/{stm32f1 => stm32/f1}/bkp.h         | 0
 include/libopencm3/{stm32f1 => stm32/f1}/dma.h         | 0
 include/libopencm3/{stm32f1 => stm32/f1}/ethernet.h    | 0
 include/libopencm3/{stm32f1 => stm32/f1}/flash.h       | 0
 include/libopencm3/{stm32f1 => stm32/f1}/gpio.h        | 0
 include/libopencm3/{stm32f1 => stm32/f1}/memorymap.h   | 0
 include/libopencm3/{stm32f1 => stm32/f1}/nvic.h        | 0
 include/libopencm3/{stm32f1 => stm32/f1}/otg_fs.h      | 0
 include/libopencm3/{stm32f1 => stm32/f1}/rcc.h         | 0
 include/libopencm3/{stm32f1 => stm32/f1}/rtc.h         | 0
 include/libopencm3/{stm32f1 => stm32/f1}/scb.h         | 0
 include/libopencm3/{stm32f1 => stm32/f1}/systick.h     | 0
 include/libopencm3/{stm32f1 => stm32/f1}/tools.h       | 0
 include/libopencm3/{stm32f1 => stm32/f1}/usb.h         | 0
 include/libopencm3/{stm32f1 => stm32/f1}/usb_desc.h    | 0
 include/libopencm3/{stm32f2 => stm32/f2}/memorymap.h   | 0
 include/libopencm3/{stm32f2 => stm32/f2}/pwr.h         | 2 +-
 include/libopencm3/{stm32f2 => stm32/f2}/spi.h         | 2 +-
 include/libopencm3/{stm32f2 => stm32/f2}/timer.h       | 0
 include/libopencm3/{stm32f2 => stm32/f2}/usart.h       | 2 +-
 include/libopencm3/{stm32_common => stm32}/fsmc.h      | 2 +-
 include/libopencm3/{stm32_common => stm32}/i2c.h       | 2 +-
 include/libopencm3/{stm32_common => stm32}/iwdg.h      | 2 +-
 include/libopencm3/{stm32_common => stm32}/memorymap.h | 2 --
 include/libopencm3/{stm32_common => stm32}/pwr.h       | 2 +-
 include/libopencm3/{stm32_common => stm32}/spi.h       | 2 +-
 include/libopencm3/{stm32_common => stm32}/timer.h     | 2 +-
 include/libopencm3/{stm32_common => stm32}/usart.h     | 2 +-
 include/libopencm3/{stm32_common => stm32}/wwdg.h      | 2 +-
 34 files changed, 15 insertions(+), 17 deletions(-)
 rename include/libopencm3/{stm32_common => stm32}/can.h (99%)
 rename include/libopencm3/{stm32_common => stm32}/crc.h (97%)
 rename include/libopencm3/{stm32_common => stm32}/dbgmcu.h (97%)
 rename include/libopencm3/{stm32_common => stm32}/exti.h (97%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/adc.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/bkp.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/dma.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/ethernet.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/flash.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/gpio.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/memorymap.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/nvic.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/otg_fs.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/rcc.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/rtc.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/scb.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/systick.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/tools.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/usb.h (100%)
 rename include/libopencm3/{stm32f1 => stm32/f1}/usb_desc.h (100%)
 rename include/libopencm3/{stm32f2 => stm32/f2}/memorymap.h (100%)
 rename include/libopencm3/{stm32f2 => stm32/f2}/pwr.h (96%)
 rename include/libopencm3/{stm32f2 => stm32/f2}/spi.h (97%)
 rename include/libopencm3/{stm32f2 => stm32/f2}/timer.h (100%)
 rename include/libopencm3/{stm32f2 => stm32/f2}/usart.h (96%)
 rename include/libopencm3/{stm32_common => stm32}/fsmc.h (99%)
 rename include/libopencm3/{stm32_common => stm32}/i2c.h (99%)
 rename include/libopencm3/{stm32_common => stm32}/iwdg.h (98%)
 rename include/libopencm3/{stm32_common => stm32}/memorymap.h (96%)
 rename include/libopencm3/{stm32_common => stm32}/pwr.h (97%)
 rename include/libopencm3/{stm32_common => stm32}/spi.h (99%)
 rename include/libopencm3/{stm32_common => stm32}/timer.h (99%)
 rename include/libopencm3/{stm32_common => stm32}/usart.h (99%)
 rename include/libopencm3/{stm32_common => stm32}/wwdg.h (97%)

diff --git a/include/libopencm3/stm32_common/can.h b/include/libopencm3/stm32/can.h
similarity index 99%
rename from include/libopencm3/stm32_common/can.h
rename to include/libopencm3/stm32/can.h
index eeac5d80..1aa95a17 100644
--- a/include/libopencm3/stm32_common/can.h
+++ b/include/libopencm3/stm32/can.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_CAN_H
 #define LIBOPENCM3_CAN_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/crc.h b/include/libopencm3/stm32/crc.h
similarity index 97%
rename from include/libopencm3/stm32_common/crc.h
rename to include/libopencm3/stm32/crc.h
index a5bc35a5..5ad866e6 100644
--- a/include/libopencm3/stm32_common/crc.h
+++ b/include/libopencm3/stm32/crc.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_CRC_H
 #define LIBOPENCM3_CRC_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- CRC registers ------------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/dbgmcu.h b/include/libopencm3/stm32/dbgmcu.h
similarity index 97%
rename from include/libopencm3/stm32_common/dbgmcu.h
rename to include/libopencm3/stm32/dbgmcu.h
index e6771a26..e753f5ed 100644
--- a/include/libopencm3/stm32_common/dbgmcu.h
+++ b/include/libopencm3/stm32/dbgmcu.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_STM32_DBGMCU_H
 #define LIBOPENCM3_STM32_DBGMCU_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- DBGMCU registers ---------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/exti.h b/include/libopencm3/stm32/exti.h
similarity index 97%
rename from include/libopencm3/stm32_common/exti.h
rename to include/libopencm3/stm32/exti.h
index caecee5d..19ab5472 100644
--- a/include/libopencm3/stm32_common/exti.h
+++ b/include/libopencm3/stm32/exti.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_EXTI_H
 #define LIBOPENCM3_EXTI_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- EXTI registers ------------------------------------------------------ */
diff --git a/include/libopencm3/stm32f1/adc.h b/include/libopencm3/stm32/f1/adc.h
similarity index 100%
rename from include/libopencm3/stm32f1/adc.h
rename to include/libopencm3/stm32/f1/adc.h
diff --git a/include/libopencm3/stm32f1/bkp.h b/include/libopencm3/stm32/f1/bkp.h
similarity index 100%
rename from include/libopencm3/stm32f1/bkp.h
rename to include/libopencm3/stm32/f1/bkp.h
diff --git a/include/libopencm3/stm32f1/dma.h b/include/libopencm3/stm32/f1/dma.h
similarity index 100%
rename from include/libopencm3/stm32f1/dma.h
rename to include/libopencm3/stm32/f1/dma.h
diff --git a/include/libopencm3/stm32f1/ethernet.h b/include/libopencm3/stm32/f1/ethernet.h
similarity index 100%
rename from include/libopencm3/stm32f1/ethernet.h
rename to include/libopencm3/stm32/f1/ethernet.h
diff --git a/include/libopencm3/stm32f1/flash.h b/include/libopencm3/stm32/f1/flash.h
similarity index 100%
rename from include/libopencm3/stm32f1/flash.h
rename to include/libopencm3/stm32/f1/flash.h
diff --git a/include/libopencm3/stm32f1/gpio.h b/include/libopencm3/stm32/f1/gpio.h
similarity index 100%
rename from include/libopencm3/stm32f1/gpio.h
rename to include/libopencm3/stm32/f1/gpio.h
diff --git a/include/libopencm3/stm32f1/memorymap.h b/include/libopencm3/stm32/f1/memorymap.h
similarity index 100%
rename from include/libopencm3/stm32f1/memorymap.h
rename to include/libopencm3/stm32/f1/memorymap.h
diff --git a/include/libopencm3/stm32f1/nvic.h b/include/libopencm3/stm32/f1/nvic.h
similarity index 100%
rename from include/libopencm3/stm32f1/nvic.h
rename to include/libopencm3/stm32/f1/nvic.h
diff --git a/include/libopencm3/stm32f1/otg_fs.h b/include/libopencm3/stm32/f1/otg_fs.h
similarity index 100%
rename from include/libopencm3/stm32f1/otg_fs.h
rename to include/libopencm3/stm32/f1/otg_fs.h
diff --git a/include/libopencm3/stm32f1/rcc.h b/include/libopencm3/stm32/f1/rcc.h
similarity index 100%
rename from include/libopencm3/stm32f1/rcc.h
rename to include/libopencm3/stm32/f1/rcc.h
diff --git a/include/libopencm3/stm32f1/rtc.h b/include/libopencm3/stm32/f1/rtc.h
similarity index 100%
rename from include/libopencm3/stm32f1/rtc.h
rename to include/libopencm3/stm32/f1/rtc.h
diff --git a/include/libopencm3/stm32f1/scb.h b/include/libopencm3/stm32/f1/scb.h
similarity index 100%
rename from include/libopencm3/stm32f1/scb.h
rename to include/libopencm3/stm32/f1/scb.h
diff --git a/include/libopencm3/stm32f1/systick.h b/include/libopencm3/stm32/f1/systick.h
similarity index 100%
rename from include/libopencm3/stm32f1/systick.h
rename to include/libopencm3/stm32/f1/systick.h
diff --git a/include/libopencm3/stm32f1/tools.h b/include/libopencm3/stm32/f1/tools.h
similarity index 100%
rename from include/libopencm3/stm32f1/tools.h
rename to include/libopencm3/stm32/f1/tools.h
diff --git a/include/libopencm3/stm32f1/usb.h b/include/libopencm3/stm32/f1/usb.h
similarity index 100%
rename from include/libopencm3/stm32f1/usb.h
rename to include/libopencm3/stm32/f1/usb.h
diff --git a/include/libopencm3/stm32f1/usb_desc.h b/include/libopencm3/stm32/f1/usb_desc.h
similarity index 100%
rename from include/libopencm3/stm32f1/usb_desc.h
rename to include/libopencm3/stm32/f1/usb_desc.h
diff --git a/include/libopencm3/stm32f2/memorymap.h b/include/libopencm3/stm32/f2/memorymap.h
similarity index 100%
rename from include/libopencm3/stm32f2/memorymap.h
rename to include/libopencm3/stm32/f2/memorymap.h
diff --git a/include/libopencm3/stm32f2/pwr.h b/include/libopencm3/stm32/f2/pwr.h
similarity index 96%
rename from include/libopencm3/stm32f2/pwr.h
rename to include/libopencm3/stm32/f2/pwr.h
index 49b33834..7cf8dabf 100644
--- a/include/libopencm3/stm32f2/pwr.h
+++ b/include/libopencm3/stm32/f2/pwr.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_PWR_F2_H
 #define LIBOPENCM3_PWR_F2_H
 
-#include <libopencm3/stm32_common/pwr.h>
+#include <libopencm3/stm32/pwr.h>
 
 /*
  * This file extends the version in stm_common with definitions only
diff --git a/include/libopencm3/stm32f2/spi.h b/include/libopencm3/stm32/f2/spi.h
similarity index 97%
rename from include/libopencm3/stm32f2/spi.h
rename to include/libopencm3/stm32/f2/spi.h
index d4aa02ed..62550cf9 100644
--- a/include/libopencm3/stm32f2/spi.h
+++ b/include/libopencm3/stm32/f2/spi.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_SPI_F2_H
 #define LIBOPENCM3_SPI_F2_H
 
-#include <libopencm3/stm32_common/spi.h>
+#include <libopencm3/stm32/spi.h>
 
 /*
  * This file extends the version in stm_common with definitions only
diff --git a/include/libopencm3/stm32f2/timer.h b/include/libopencm3/stm32/f2/timer.h
similarity index 100%
rename from include/libopencm3/stm32f2/timer.h
rename to include/libopencm3/stm32/f2/timer.h
diff --git a/include/libopencm3/stm32f2/usart.h b/include/libopencm3/stm32/f2/usart.h
similarity index 96%
rename from include/libopencm3/stm32f2/usart.h
rename to include/libopencm3/stm32/f2/usart.h
index 8d1cacac..1baf5a19 100644
--- a/include/libopencm3/stm32f2/usart.h
+++ b/include/libopencm3/stm32/f2/usart.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_USART_F2_H
 #define LIBOPENCM3_USART_F2_H
 
-#include <libopencm3/stm32_common/usart.h>
+#include <libopencm3/stm32/usart.h>
 
 /* --- USART_CR1 values ---------------------------------------------------- */
 
diff --git a/include/libopencm3/stm32_common/fsmc.h b/include/libopencm3/stm32/fsmc.h
similarity index 99%
rename from include/libopencm3/stm32_common/fsmc.h
rename to include/libopencm3/stm32/fsmc.h
index 5ccd1d1f..1d318e31 100644
--- a/include/libopencm3/stm32_common/fsmc.h
+++ b/include/libopencm3/stm32/fsmc.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_FSMC_H
 #define LIBOPENCM3_FSMC_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/i2c.h b/include/libopencm3/stm32/i2c.h
similarity index 99%
rename from include/libopencm3/stm32_common/i2c.h
rename to include/libopencm3/stm32/i2c.h
index 1fa4f372..d182f4ed 100644
--- a/include/libopencm3/stm32_common/i2c.h
+++ b/include/libopencm3/stm32/i2c.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_I2C_H
 #define LIBOPENCM3_I2C_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/iwdg.h b/include/libopencm3/stm32/iwdg.h
similarity index 98%
rename from include/libopencm3/stm32_common/iwdg.h
rename to include/libopencm3/stm32/iwdg.h
index 67f29610..bf2784ab 100644
--- a/include/libopencm3/stm32_common/iwdg.h
+++ b/include/libopencm3/stm32/iwdg.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_IWDG_H
 #define LIBOPENCM3_IWDG_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- IWDG registers ------------------------------------------------------ */
diff --git a/include/libopencm3/stm32_common/memorymap.h b/include/libopencm3/stm32/memorymap.h
similarity index 96%
rename from include/libopencm3/stm32_common/memorymap.h
rename to include/libopencm3/stm32/memorymap.h
index 0d0c60fb..17a919ef 100644
--- a/include/libopencm3/stm32_common/memorymap.h
+++ b/include/libopencm3/stm32/memorymap.h
@@ -20,8 +20,6 @@
 #ifndef LIBOPENCM3_MEMORYMAP_COMMON_H
 #define LIBOPENCM3_MEMORYMAP_COMMON_H
 
-#include <libopencm3/cm3/memorymap.h>
-
 #ifdef STM32F1
 #include <libopencm3/stm32f1/memorymap.h>
 #else
diff --git a/include/libopencm3/stm32_common/pwr.h b/include/libopencm3/stm32/pwr.h
similarity index 97%
rename from include/libopencm3/stm32_common/pwr.h
rename to include/libopencm3/stm32/pwr.h
index 4af84804..e5b98042 100644
--- a/include/libopencm3/stm32_common/pwr.h
+++ b/include/libopencm3/stm32/pwr.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_PWR_H
 #define LIBOPENCM3_PWR_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- PWR registers ------------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/spi.h b/include/libopencm3/stm32/spi.h
similarity index 99%
rename from include/libopencm3/stm32_common/spi.h
rename to include/libopencm3/stm32/spi.h
index 32494570..3cadaf8c 100644
--- a/include/libopencm3/stm32_common/spi.h
+++ b/include/libopencm3/stm32/spi.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_SPI_H
 #define LIBOPENCM3_SPI_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* Registers can be accessed as 16bit or 32bit values. */
diff --git a/include/libopencm3/stm32_common/timer.h b/include/libopencm3/stm32/timer.h
similarity index 99%
rename from include/libopencm3/stm32_common/timer.h
rename to include/libopencm3/stm32/timer.h
index c1eac99a..7b5df860 100644
--- a/include/libopencm3/stm32_common/timer.h
+++ b/include/libopencm3/stm32/timer.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_TIMER_H
 #define LIBOPENCM3_TIMER_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/usart.h b/include/libopencm3/stm32/usart.h
similarity index 99%
rename from include/libopencm3/stm32_common/usart.h
rename to include/libopencm3/stm32/usart.h
index 0a1ed363..df6bc089 100644
--- a/include/libopencm3/stm32_common/usart.h
+++ b/include/libopencm3/stm32/usart.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_USART_H
 #define LIBOPENCM3_USART_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- Convenience macros -------------------------------------------------- */
diff --git a/include/libopencm3/stm32_common/wwdg.h b/include/libopencm3/stm32/wwdg.h
similarity index 97%
rename from include/libopencm3/stm32_common/wwdg.h
rename to include/libopencm3/stm32/wwdg.h
index e1787c86..552d02ed 100644
--- a/include/libopencm3/stm32_common/wwdg.h
+++ b/include/libopencm3/stm32/wwdg.h
@@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_WWDG_H
 #define LIBOPENCM3_WWDG_H
 
-#include <libopencm3/stm32_common/memorymap.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/cm3/common.h>
 
 /* --- WWDG registers ------------------------------------------------------ */

From 95d4532595369b09bd48e9f7706b0ddef3149985 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Wed, 14 Sep 2011 22:36:15 -0700
Subject: [PATCH 20/51] Initial import of F2 GPIO peripheral header file.

---
 include/libopencm3/stm32/f2/gpio.h | 274 +++++++++++++++++++++++++++++
 1 file changed, 274 insertions(+)
 create mode 100644 include/libopencm3/stm32/f2/gpio.h

diff --git a/include/libopencm3/stm32/f2/gpio.h b/include/libopencm3/stm32/f2/gpio.h
new file mode 100644
index 00000000..33393114
--- /dev/null
+++ b/include/libopencm3/stm32/f2/gpio.h
@@ -0,0 +1,274 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_GPIO_H
+#define LIBOPENCM3_GPIO_H
+
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
+
+/* --- Convenience macros -------------------------------------------------- */
+
+/* GPIO port base addresses (for convenience) */
+#define GPIOA       GPIO_PORT_A_BASE
+#define GPIOB       GPIO_PORT_B_BASE
+#define GPIOC       GPIO_PORT_C_BASE
+#define GPIOD       GPIO_PORT_D_BASE
+#define GPIOE       GPIO_PORT_E_BASE
+#define GPIOF       GPIO_PORT_F_BASE
+#define GPIOG       GPIO_PORT_G_BASE
+#define GPIOH       GPIO_PORT_H_BASE
+#define GPIOI       GPIO_PORT_I_BASE
+
+/* GPIO number definitions (for convenience) */
+#define GPIO0       (1 << 0)
+#define GPIO1       (1 << 1)
+#define GPIO2       (1 << 2)
+#define GPIO3       (1 << 3)
+#define GPIO4       (1 << 4)
+#define GPIO5       (1 << 5)
+#define GPIO6       (1 << 6)
+#define GPIO7       (1 << 7)
+#define GPIO8       (1 << 8)
+#define GPIO9       (1 << 9)
+#define GPIO10      (1 << 10)
+#define GPIO11      (1 << 11)
+#define GPIO12      (1 << 12)
+#define GPIO13      (1 << 13)
+#define GPIO14      (1 << 14)
+#define GPIO15      (1 << 15)
+#define GPIO_ALL    0xffff
+
+/* --- GPIO registers ------------------------------------------------------ */
+
+/* Port mode register (GPIOx_MODER) */
+#define GPIO_MODER(port)			MMIO32(port + 0x00)
+#define GPIOA_MODER			GPIO_MODER(GPIOA)
+#define GPIOB_MODER			GPIO_MODER(GPIOB)
+#define GPIOC_MODER			GPIO_MODER(GPIOC)
+#define GPIOD_MODER			GPIO_MODER(GPIOD)
+#define GPIOE_MODER			GPIO_MODER(GPIOE)
+#define GPIOF_MODER			GPIO_MODER(GPIOF)
+#define GPIOG_MODER			GPIO_MODER(GPIOG)
+#define GPIOH_MODER			GPIO_MODER(GPIOH)
+#define GPIOI_MODER			GPIO_MODER(GPIOI)
+
+/* Port output type register (GPIOx_OTYPER) */
+#define GPIO_OTYPER(port)			MMIO32(port + 0x04)
+#define GPIOA_OTYPER			GPIO_OTYPER(GPIOA)
+#define GPIOB_OTYPER			GPIO_OTYPER(GPIOB)
+#define GPIOC_OTYPER			GPIO_OTYPER(GPIOC)
+#define GPIOD_OTYPER			GPIO_OTYPER(GPIOD)
+#define GPIOE_OTYPER			GPIO_OTYPER(GPIOE)
+#define GPIOF_OTYPER			GPIO_OTYPER(GPIOF)
+#define GPIOG_OTYPER			GPIO_OTYPER(GPIOG)
+#define GPIOH_OTYPER			GPIO_OTYPER(GPIOH)
+#define GPIOI_OTYPER			GPIO_OTYPER(GPIOI)
+
+/* Port output speed register (GPIOx_OSPEEDR) */
+#define GPIO_OSPEEDR(port)			MMIO32(port + 0x08)
+#define GPIOA_OSPEEDR			GPIO_OSPEEDR(GPIOA)
+#define GPIOB_OSPEEDR			GPIO_OSPEEDR(GPIOB)
+#define GPIOC_OSPEEDR			GPIO_OSPEEDR(GPIOC)
+#define GPIOD_OSPEEDR			GPIO_OSPEEDR(GPIOD)
+#define GPIOE_OSPEEDR			GPIO_OSPEEDR(GPIOE)
+#define GPIOF_OSPEEDR			GPIO_OSPEEDR(GPIOF)
+#define GPIOG_OSPEEDR			GPIO_OSPEEDR(GPIOG)
+#define GPIOH_OSPEEDR			GPIO_OSPEEDR(GPIOH)
+#define GPIOI_OSPEEDR			GPIO_OSPEEDR(GPIOI)
+
+/* Port pull-up/pull-down register (GPIOx_PUPDR) */
+#define GPIO_PUPDR(port)			MMIO32(port + 0x0C)
+#define GPIOA_PUPDR			GPIO_PUPDR(GPIOA)
+#define GPIOB_PUPDR			GPIO_PUPDR(GPIOB)
+#define GPIOC_PUPDR			GPIO_PUPDR(GPIOC)
+#define GPIOD_PUPDR			GPIO_PUPDR(GPIOD)
+#define GPIOE_PUPDR			GPIO_PUPDR(GPIOE)
+#define GPIOF_PUPDR			GPIO_PUPDR(GPIOF)
+#define GPIOG_PUPDR			GPIO_PUPDR(GPIOG)
+#define GPIOH_PUPDR			GPIO_PUPDR(GPIOH)
+#define GPIOI_PUPDR			GPIO_PUPDR(GPIOI)
+
+/* Port input data register (GPIOx_IDR) */
+#define GPIO_IDR(port)			MMIO32(port + 0x10)
+#define GPIOA_IDR			GPIO_IDR(GPIOA)
+#define GPIOB_IDR			GPIO_IDR(GPIOB)
+#define GPIOC_IDR			GPIO_IDR(GPIOC)
+#define GPIOD_IDR			GPIO_IDR(GPIOD)
+#define GPIOE_IDR			GPIO_IDR(GPIOE)
+#define GPIOF_IDR			GPIO_IDR(GPIOF)
+#define GPIOG_IDR			GPIO_IDR(GPIOG)
+#define GPIOH_IDR			GPIO_IDR(GPIOH)
+#define GPIOI_IDR			GPIO_IDR(GPIOI)
+
+/* Port output data register (GPIOx_ODR) */
+#define GPIO_ODR(port)			MMIO32(port + 0x14)
+#define GPIOA_ODR			GPIO_ODR(GPIOA)
+#define GPIOB_ODR			GPIO_ODR(GPIOB)
+#define GPIOC_ODR			GPIO_ODR(GPIOC)
+#define GPIOD_ODR			GPIO_ODR(GPIOD)
+#define GPIOE_ODR			GPIO_ODR(GPIOE)
+#define GPIOF_ODR			GPIO_ODR(GPIOF)
+#define GPIOG_ODR			GPIO_ODR(GPIOG)
+#define GPIOH_ODR			GPIO_ODR(GPIOH)
+#define GPIOI_ODR			GPIO_ODR(GPIOI)
+
+/* Port bit set/reset register (GPIOx_BSRR) */
+#define GPIO_BSRR(port)			MMIO32(port + 0x18)
+#define GPIOA_BSRR			GPIO_BSRR(GPIOA)
+#define GPIOB_BSRR			GPIO_BSRR(GPIOB)
+#define GPIOC_BSRR			GPIO_BSRR(GPIOC)
+#define GPIOD_BSRR			GPIO_BSRR(GPIOD)
+#define GPIOE_BSRR			GPIO_BSRR(GPIOE)
+#define GPIOF_BSRR			GPIO_BSRR(GPIOF)
+#define GPIOG_BSRR			GPIO_BSRR(GPIOG)
+#define GPIOH_BSRR			GPIO_BSRR(GPIOH)
+#define GPIOI_BSRR			GPIO_BSRR(GPIOI)
+
+/* Port configuration lock register (GPIOx_LCKR) */
+#define GPIO_LCKR(port)			MMIO32(port + 0x1C)
+#define GPIOA_LCKR			GPIO_LCKR(GPIOA)
+#define GPIOB_LCKR			GPIO_LCKR(GPIOB)
+#define GPIOC_LCKR			GPIO_LCKR(GPIOC)
+#define GPIOD_LCKR			GPIO_LCKR(GPIOD)
+#define GPIOE_LCKR			GPIO_LCKR(GPIOE)
+#define GPIOF_LCKR			GPIO_LCKR(GPIOF)
+#define GPIOG_LCKR			GPIO_LCKR(GPIOG)
+#define GPIOH_LCKR			GPIO_LCKR(GPIOH)
+#define GPIOI_LCKR			GPIO_LCKR(GPIOI)
+
+/* Alternate function low register (GPIOx_AFRL) */
+#define GPIO_AFRL(port)			MMIO32(port + 0x20)
+#define GPIOA_AFRL			GPIO_AFRL(GPIOA)
+#define GPIOB_AFRL			GPIO_AFRL(GPIOB)
+#define GPIOC_AFRL			GPIO_AFRL(GPIOC)
+#define GPIOD_AFRL			GPIO_AFRL(GPIOD)
+#define GPIOE_AFRL			GPIO_AFRL(GPIOE)
+#define GPIOF_AFRL			GPIO_AFRL(GPIOF)
+#define GPIOG_AFRL			GPIO_AFRL(GPIOG)
+#define GPIOH_AFRL			GPIO_AFRL(GPIOH)
+#define GPIOI_AFRL			GPIO_AFRL(GPIOI)
+
+/* Alternate function high register (GPIOx_AFRH) */
+#define GPIO_AFRH(port)			MMIO32(port + 0x24)
+#define GPIOA_AFRH			GPIO_AFRH(GPIOA)
+#define GPIOB_AFRH			GPIO_AFRH(GPIOB)
+#define GPIOC_AFRH			GPIO_AFRH(GPIOC)
+#define GPIOD_AFRH			GPIO_AFRH(GPIOD)
+#define GPIOE_AFRH			GPIO_AFRH(GPIOE)
+#define GPIOF_AFRH			GPIO_AFRH(GPIOF)
+#define GPIOG_AFRH			GPIO_AFRH(GPIOG)
+#define GPIOH_AFRH			GPIO_AFRH(GPIOH)
+#define GPIOI_AFRH			GPIO_AFRH(GPIOI)
+
+/* --- GPIOx_MODER values -------------------------------------------------- */
+
+#define GPIO_MODE(n, mode) (mode << (2*n))
+#define GPIO_MODE_INPUT  0x0
+#define GPIO_MODE_OUTPUT 0x1
+#define GPIO_MODE_AF     0x2
+#define GPIO_MODE_ANALOG 0x3
+
+/* --- GPIOx_OTYPER values ------------------------------------------------- */
+
+#define GPIO_OTYPE_PP 0x0
+#define GPIO_OTYPE_OD 0x1
+
+/* --- GPIOx_OSPEEDR values ------------------------------------------------ */
+
+#define GPIO_OSPEED(n, speed) (speed << (2*n))
+#define GPIO_OSPEED_2MHZ   0x0
+#define GPIO_OSPEED_25MHZ  0x1
+#define GPIO_OSPEED_50MHZ  0x2
+#define GPIO_OSPEED_100MHZ 0x3
+
+/* --- GPIOx_PUPDR values -------------------------------------------------- */
+
+#define GPIO_PUPD(n, pupd) (pupd << (2*n))
+#define GPIO_PUPD_NONE     0x0
+#define GPIO_PUPD_PULLUP   0x1
+#define GPIO_PUPD_PULLDOWN 0x2
+
+/* --- GPIOx_IDR values ---------------------------------------------------- */
+
+/* GPIOx_IDR[15:0]: IDRy[15:0]: Port input data (y = 0..15) */
+
+/* --- GPIOx_ODR values ---------------------------------------------------- */
+
+/* GPIOx_ODR[15:0]: ODRy[15:0]: Port output data (y = 0..15) */
+
+/* --- GPIOx_BSRR values --------------------------------------------------- */
+
+/* GPIOx_BSRR[31:16]: BRy: Port x reset bit y (y = 0..15) */
+/* GPIOx_BSRR[15:0]: BSy: Port x set bit y (y = 0..15) */
+
+/* --- GPIOx_LCKR values --------------------------------------------------- */
+
+#define GPIO_LCKK			(1 << 16)
+/* GPIOx_LCKR[15:0]: LCKy: Port x lock bit y (y = 0..15) */
+
+/* --- GPIOx_AFRL/H values ------------------------------------------------- */
+
+/* Note: AFRL is used for bits 0..7, AFRH is used for 8..15 */
+/* See Datasheet Table 6 (pg. 48) for alternate function mappings. */
+
+#define GPIO_AFR(n, af) (af << (n*4))
+#define GPIO_AF0  0x0
+#define GPIO_AF1  0x1
+#define GPIO_AF2  0x2
+#define GPIO_AF3  0x3
+#define GPIO_AF4  0x4
+#define GPIO_AF5  0x5
+#define GPIO_AF6  0x6
+#define GPIO_AF7  0x7
+#define GPIO_AF8  0x8
+#define GPIO_AF9  0x9
+#define GPIO_AF10 0xA
+#define GPIO_AF11 0xB
+#define GPIO_AF12 0xC
+#define GPIO_AF13 0xD
+#define GPIO_AF14 0xE
+#define GPIO_AF15 0xF
+
+/* Note: EXTI source selection is now in the SYSCFG peripheral. */
+
+/* --- Function prototypes ------------------------------------------------- */
+
+/*
+ * Note: The F2 series has a completely new GPIO peripheral with different
+ * configuration options. Here we implement a different API partly to more
+ * closely match the peripheral capabilities and also to deliberately break
+ * compatibility with old F1 code so there is no confusion with similar 
+ * sounding functions that have very different functionality.
+ */
+
+void gpio_mode_setup(u32 gpioport, u8 mode, u8 pull_up_down, u16 gpios);
+void gpio_set_output_options(u32 gpioport, u8 otype, u8 speed, u16 gpios);
+void gpio_set_af(u32 gpioport, u8 alt_func_num, u16 gpios);
+
+/* This part of the API is compatible with the F1 series */
+void gpio_set(u32 gpioport, u16 gpios);
+void gpio_clear(u32 gpioport, u16 gpios);
+u16 gpio_get(u32 gpioport, u16 gpios);
+void gpio_toggle(u32 gpioport, u16 gpios);
+u16 gpio_port_read(u32 gpioport);
+void gpio_port_write(u32 gpioport, u16 data);
+void gpio_port_config_lock(u32 gpioport, u16 gpios);
+
+#endif

From 60dcacccb7ae8f80ca224e38abdfca1236d1871e Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Wed, 14 Sep 2011 23:57:43 -0700
Subject: [PATCH 21/51] Some updates to the F2 GPIO header plus implementation
 of GPIO convenience functions.

---
 include/libopencm3/stm32/f2/gpio.h |  14 ++-
 lib/stm32f2/gpio.c                 | 156 +++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+), 5 deletions(-)
 create mode 100644 lib/stm32f2/gpio.c

diff --git a/include/libopencm3/stm32/f2/gpio.h b/include/libopencm3/stm32/f2/gpio.h
index 33393114..b4fb4f34 100644
--- a/include/libopencm3/stm32/f2/gpio.h
+++ b/include/libopencm3/stm32/f2/gpio.h
@@ -179,7 +179,8 @@
 
 /* --- GPIOx_MODER values -------------------------------------------------- */
 
-#define GPIO_MODE(n, mode) (mode << (2*n))
+#define GPIO_MODE(n, mode) (mode << (2*(n)))
+#define GPIO_MODE_MASK(n) (0x3 << (2*(n)))
 #define GPIO_MODE_INPUT  0x0
 #define GPIO_MODE_OUTPUT 0x1
 #define GPIO_MODE_AF     0x2
@@ -192,7 +193,8 @@
 
 /* --- GPIOx_OSPEEDR values ------------------------------------------------ */
 
-#define GPIO_OSPEED(n, speed) (speed << (2*n))
+#define GPIO_OSPEED(n, speed) (speed << (2*(n)))
+#define GPIO_OSPEED_MASK(n) (0x3 << (2*(n)))
 #define GPIO_OSPEED_2MHZ   0x0
 #define GPIO_OSPEED_25MHZ  0x1
 #define GPIO_OSPEED_50MHZ  0x2
@@ -200,7 +202,8 @@
 
 /* --- GPIOx_PUPDR values -------------------------------------------------- */
 
-#define GPIO_PUPD(n, pupd) (pupd << (2*n))
+#define GPIO_PUPD(n, pupd) (pupd << (2*(n)))
+#define GPIO_PUPD_MASK(n) (0x3 << (2*(n)))
 #define GPIO_PUPD_NONE     0x0
 #define GPIO_PUPD_PULLUP   0x1
 #define GPIO_PUPD_PULLDOWN 0x2
@@ -228,7 +231,8 @@
 /* Note: AFRL is used for bits 0..7, AFRH is used for 8..15 */
 /* See Datasheet Table 6 (pg. 48) for alternate function mappings. */
 
-#define GPIO_AFR(n, af) (af << (n*4))
+#define GPIO_AFR(n, af) (af << ((n)*4))
+#define GPIO_AFR_MASK(n) (0xF << ((n)*4))
 #define GPIO_AF0  0x0
 #define GPIO_AF1  0x1
 #define GPIO_AF2  0x2
@@ -262,7 +266,7 @@ void gpio_mode_setup(u32 gpioport, u8 mode, u8 pull_up_down, u16 gpios);
 void gpio_set_output_options(u32 gpioport, u8 otype, u8 speed, u16 gpios);
 void gpio_set_af(u32 gpioport, u8 alt_func_num, u16 gpios);
 
-/* This part of the API is compatible with the F1 series */
+/* This part of the API is compatible with the F1 series ------------------- */
 void gpio_set(u32 gpioport, u16 gpios);
 void gpio_clear(u32 gpioport, u16 gpios);
 u16 gpio_get(u32 gpioport, u16 gpios);
diff --git a/lib/stm32f2/gpio.c b/lib/stm32f2/gpio.c
new file mode 100644
index 00000000..f2ea55a5
--- /dev/null
+++ b/lib/stm32f2/gpio.c
@@ -0,0 +1,156 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Basic GPIO handling API.
+ *
+ * Examples:
+ *  gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
+ *                GPIO_CNF_OUTPUT_PUSHPULL, GPIO12);
+ *  gpio_set(GPIOB, GPIO4);
+ *  gpio_clear(GPIOG, GPIO2 | GPIO9);
+ *  gpio_get(GPIOC, GPIO1);
+ *  gpio_toggle(GPIOA, GPIO7 | GPIO8);
+ *  reg16 = gpio_port_read(GPIOD);
+ *  gpio_port_write(GPIOF, 0xc8fe);
+ *
+ * TODO:
+ *  - GPIO remapping support
+ */
+
+#include <libopencm3/stm32/f2/gpio.h>
+
+void gpio_mode_setup(u32 gpioport, u8 mode, u8 pull_up_down, u16 gpios)
+{
+	u16 i;
+	u16 moder, pupd;
+
+	/*
+	 * We want to set the config only for the pins mentioned in gpios,
+	 * but keeping the others, so read out the actual config first.
+	 */
+	moder = GPIO_MODER(gpioport);
+	pupd = GPIO_PUPDR(gpioport);
+	
+	for (i = 0; i < 16; i++) {
+		if (!((1 << i) & gpios))
+			continue;
+
+		moder &= ~GPIO_MODE_MASK(i);
+		moder |= GPIO_MODE(i, mode);
+		pupd &= ~GPIO_PUPD_MASK(i);
+		pupd |= GPIO_PUPD(i, pull_up_down);
+	}
+
+	/* Set mode and pull up/down control registers. */
+	GPIO_MODER(gpioport) = moder;
+	GPIO_PUPDR(gpioport) = pupd;
+}
+
+void gpio_set_output_options(u32 gpioport, u8 otype, u8 speed, u16 gpios)
+{
+	u16 i;
+	u16 ospeedr;
+
+	if (otype == 0x1)
+		GPIO_OTYPER(gpioport) |= gpios;
+	else
+		GPIO_OTYPER(gpioport) &= ~gpios;
+
+	ospeedr = GPIO_OSPEEDR(gpioport);
+	
+	for (i = 0; i < 16; i++) {
+		if (!((1 << i) & gpios))
+			continue
+		ospeedr &= ~GPIO_OSPEEDR_MASK(i);
+		ospeedr |= GPIO_OSPEEDR(i, mode);
+	}
+
+	GPIO_OSPEEDR(gpioport) = ospeedr;
+}
+
+void gpio_set_af(u32 gpioport, u8 alt_func_num, u16 gpios)
+{
+	u16 i;
+	u16 afrl, afrh;
+
+	afrl = GPIO_AFRL(gpioport);
+	afrh = GPIO_AFRH(gpioport);
+
+	for (i = 0; i < 8; i++) {
+		if (!((1 << i) & gpios))
+			continue
+		afrl &= GPIO_AFR_MASK(i);
+		afrl |= GPIO_AFR(i, alt_func_num);
+	}
+
+	for (i = 8; i < 16; i++) {
+		if (!((1 << i) & gpios))
+			continue
+		afrl &= GPIO_AFR_MASK(i-8);
+		afrh |= GPIO_AFR(i-8, alt_func_num);
+	}
+
+	GPIO_AFRL(gpioport) = afrl;
+	GPIO_AFRH(gpioport) = afrh;
+}
+
+void gpio_set(u32 gpioport, u16 gpios)
+{
+	GPIO_BSRR(gpioport) = gpios;
+}
+
+void gpio_clear(u32 gpioport, u16 gpios)
+{
+	GPIO_BSRR(gpioport) = gpios << 16;
+}
+
+u16 gpio_get(u32 gpioport, u16 gpios)
+{
+	return gpio_port_read(gpioport) & gpios;
+}
+
+void gpio_toggle(u32 gpioport, u16 gpios)
+{
+	GPIO_ODR(gpioport) = GPIO_IDR(gpioport) ^ gpios;
+}
+
+u16 gpio_port_read(u32 gpioport)
+{
+	return (u16)GPIO_IDR(gpioport);
+}
+
+void gpio_port_write(u32 gpioport, u16 data)
+{
+	GPIO_ODR(gpioport) = data;
+}
+
+void gpio_port_config_lock(u32 gpioport, u16 gpios)
+{
+	u32 reg32;
+
+	/* Special "Lock Key Writing Sequence", see datasheet. */
+	GPIO_LCKR(gpioport) = GPIO_LCKK | gpios;	/* Set LCKK. */
+	GPIO_LCKR(gpioport) = ~GPIO_LCKK & gpios;	/* Clear LCKK. */
+	GPIO_LCKR(gpioport) = GPIO_LCKK | gpios;	/* Set LCKK. */
+	reg32 = GPIO_LCKR(gpioport);			/* Read LCKK. */
+	reg32 = GPIO_LCKR(gpioport);			/* Read LCKK again. */
+	
+	/* If (reg32 & GPIO_LCKK) is true, the lock is now active. */
+}

From 8da449679988e32d35359fa8a952ec8d2ed07297 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 00:05:57 -0700
Subject: [PATCH 22/51] Adding stm32f2 target in top level Makefile and
 renaming f1 target.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fe06961f..e6935163 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ LIBDIR		= $(DESTDIR)/$(PREFIX)/lib
 SHAREDIR        = $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts
 INSTALL		= install
 
-TARGETS = stm32 lpc13xx lm3s
+TARGETS = stm32f1 stm32f2 lpc13xx lm3s
 
 # Be silent per default, but 'make V=1' will show all compiler calls.
 ifneq ($(V),1)

From 775288bc1326e7a6a03a1b60db6dac88e26f0c5a Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 00:06:35 -0700
Subject: [PATCH 23/51] Renaming things in the F1 target Makefile.

---
 lib/stm32f1/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/stm32f1/Makefile b/lib/stm32f1/Makefile
index 5f26c295..3d154aa8 100644
--- a/lib/stm32f1/Makefile
+++ b/lib/stm32f1/Makefile
@@ -17,7 +17,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-LIBNAME		= libopencm3_stm32
+LIBNAME		= libopencm3_stm32f1
 
 PREFIX		?= arm-none-eabi
 #PREFIX		?= arm-elf
@@ -51,7 +51,7 @@ $(LIBNAME).a: $(OBJS)
 	$(Q)$(CC) $(CFLAGS) -o $@ -c $<
 
 clean:
-	@printf "  CLEAN   lib/stm32\n"
+	@printf "  CLEAN   lib/stm32f1\n"
 	$(Q)rm -f *.o *.d
 	$(Q)rm -f $(LIBNAME).a
 

From 8a2cf9dd4b1ff3d14a67ee1545f1f58644170240 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 00:07:14 -0700
Subject: [PATCH 24/51] Copying F1 linker script over to the F2 target,
 hopefully it should be the same!

---
 lib/stm32f2/libopencm3_stm32f2.ld | 63 +++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 lib/stm32f2/libopencm3_stm32f2.ld

diff --git a/lib/stm32f2/libopencm3_stm32f2.ld b/lib/stm32f2/libopencm3_stm32f2.ld
new file mode 100644
index 00000000..fda7d023
--- /dev/null
+++ b/lib/stm32f2/libopencm3_stm32f2.ld
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Generic linker script for STM32 targets using libopencm3. */
+
+/* Memory regions must be defined in the ld script which includes this one. */
+
+/* Enforce emmition of the vector table. */
+EXTERN (vector_table)
+
+/* Define sections. */
+SECTIONS
+{
+	. = ORIGIN(rom);
+
+	.text : {
+		*(.vectors)	/* Vector table */
+		*(.text*)	/* Program code */
+		*(.rodata*)	/* Read-only data */
+		_etext = .;
+	} >rom
+
+	. = ORIGIN(ram);
+
+	.data : {
+		_data = .;
+		*(.data*)	/* Read-write initialized data */
+		_edata = .;
+	} >ram AT >rom
+
+	.bss : {
+		*(.bss*)	/* Read-write zero initialized data */
+		*(COMMON)
+		_ebss = .;
+	} >ram AT >rom
+
+	/*
+	 * The .eh_frame section appears to be used for C++ exception handling.
+	 * You may need to fix this if you're using C++.
+	 */
+	/DISCARD/ : { *(.eh_frame) }
+
+	end = .;
+}
+
+PROVIDE(_stack = 0x20000800);
+

From 7524b0f4c56e4b9785eac47ffe0fcbc4553d349e Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 00:59:30 -0700
Subject: [PATCH 25/51] Adding vector table for F2.

---
 lib/stm32f2/vector.c | 336 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 336 insertions(+)
 create mode 100644 lib/stm32f2/vector.c

diff --git a/lib/stm32f2/vector.c b/lib/stm32f2/vector.c
new file mode 100644
index 00000000..d6f70f8e
--- /dev/null
+++ b/lib/stm32f2/vector.c
@@ -0,0 +1,336 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2010 Piotr Esden-Tempski <piotr@esden.net>
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define WEAK __attribute__ ((weak))
+
+/* Symbols exported by linker script */
+extern unsigned _etext, _data, _edata, _ebss, _stack;
+
+void main(void);
+void reset_handler(void);
+void blocking_handler(void);
+void null_handler(void);
+
+void WEAK reset_handler(void);
+void WEAK nmi_handler(void);
+void WEAK hard_fault_handler(void);
+void WEAK mem_manage_handler(void);
+void WEAK bus_fault_handler(void);
+void WEAK usage_fault_handler(void);
+void WEAK sv_call_handler(void);
+void WEAK debug_monitor_handler(void);
+void WEAK pend_sv_handler(void);
+void WEAK sys_tick_handler(void);
+void WEAK wwdg_isr(void);
+void WEAK pvd_isr(void);
+void WEAK tamp_stamp_isr(void);
+void WEAK rtc_wkup_isr(void);
+void WEAK flash_isr(void);
+void WEAK rcc_isr(void);
+void WEAK exti0_isr(void);
+void WEAK exti1_isr(void);
+void WEAK exti2_isr(void);
+void WEAK exti3_isr(void);
+void WEAK exti4_isr(void);
+void WEAK dma1_stream0_isr(void);
+void WEAK dma1_stream1_isr(void);
+void WEAK dma1_stream2_isr(void);
+void WEAK dma1_stream3_isr(void);
+void WEAK dma1_stream4_isr(void);
+void WEAK dma1_stream5_isr(void);
+void WEAK dma1_stream6_isr(void);
+void WEAK adc_isr(void);
+void WEAK can1_tx_isr(void);
+void WEAK can1_rx0_isr(void);
+void WEAK can1_rx1_isr(void);
+void WEAK can1_sce_isr(void);
+void WEAK exti9_5_isr(void);
+void WEAK tim1_brk_tim9_isr(void);
+void WEAK tim1_up_tim10_isr(void);
+void WEAK tim1_trg_com_tim11_isr(void);
+void WEAK tim1_cc_isr(void);
+void WEAK tim2_isr(void);
+void WEAK tim3_isr(void);
+void WEAK tim4_isr(void);
+void WEAK i2c1_ev_isr(void);
+void WEAK i2c1_er_isr(void);
+void WEAK i2c2_ev_isr(void);
+void WEAK i2c2_er_isr(void);
+void WEAK spi1_isr(void);
+void WEAK spi2_isr(void);
+void WEAK usart1_isr(void);
+void WEAK usart2_isr(void);
+void WEAK usart3_isr(void);
+void WEAK exti15_10_isr(void);
+void WEAK rtc_alarm_isr(void);
+void WEAK usb_fs_wkup_isr(void);
+void WEAK tim8_brk_tim12_isr(void);
+void WEAK tim8_up_tim13_isr(void);
+void WEAK tim8_trg_com_tim14_isr(void);
+void WEAK tim8_cc_isr(void);
+void WEAK dma1_stream7_isr(void);
+void WEAK fsmc_isr(void);
+void WEAK sdio_isr(void);
+void WEAK tim5_isr(void);
+void WEAK spi3_isr(void);
+void WEAK usart4_isr(void);
+void WEAK usart5_isr(void);
+void WEAK tim6_dac_isr(void);
+void WEAK tim7_isr(void);
+void WEAK dma2_stream0_isr(void);
+void WEAK dma2_stream1_isr(void);
+void WEAK dma2_stream2_isr(void);
+void WEAK dma2_stream3_isr(void);
+void WEAK dma2_stream4_isr(void);
+void WEAK eth_isr(void);
+void WEAK eth_wkup_isr(void);
+void WEAK can2_tx_isr(void);
+void WEAK can2_rx0_isr(void);
+void WEAK can2_rx1_isr(void);
+void WEAK can2_sce_isr(void);
+void WEAK otg_fs_isr(void);
+void WEAK dma2_stream5_isr(void);
+void WEAK dma2_stream6_isr(void);
+void WEAK dma2_stream7_isr(void);
+void WEAK usart6_isr(void);
+void WEAK i2c3_ev_isr(void);
+void WEAK i2c3_er_isr(void);
+void WEAK otg_hs_ep1_out_isr(void);
+void WEAK otg_hs_ep1_in_isr(void);
+void WEAK otg_hs_wkup_isr(void);
+void WEAK otg_hs_isr(void);
+void WEAK dcmi_isr(void);
+void WEAK cryp_isr(void);
+void WEAK hash_rng_isr(void);
+
+__attribute__ ((section(".vectors")))
+void (*const vector_table[]) (void) = {
+	(void*)&_stack,
+	reset_handler,
+	nmi_handler,
+	hard_fault_handler,
+	mem_manage_handler,
+	bus_fault_handler,
+	usage_fault_handler,
+	0, 0, 0, 0,		/* Reserved */
+	sv_call_handler,
+	debug_monitor_handler,
+	0,			/* Reserved */
+	pend_sv_handler,
+	sys_tick_handler,
+	wwdg_isr,
+	pvd_isr,
+	tamp_stamp_isr,
+	rtc_wkup_isr,
+	flash_isr,
+	rcc_isr,
+	exti0_isr,
+	exti1_isr,
+	exti2_isr,
+	exti3_isr,
+	exti4_isr,
+	dma1_stream0_isr,
+	dma1_stream1_isr,
+	dma1_stream2_isr,
+	dma1_stream3_isr,
+	dma1_stream4_isr,
+	dma1_stream5_isr,
+	dma1_stream6_isr,
+	adc_isr,
+	can1_tx_isr,
+	can1_rx0_isr,
+	can1_rx1_isr,
+	can1_sce_isr,
+	exti9_5_isr,
+	tim1_brk_tim9_isr,
+	tim1_up_tim10_isr,
+	tim1_trg_com_tim11_isr,
+	tim1_cc_isr,
+	tim2_isr,
+	tim3_isr,
+	tim4_isr,
+	i2c1_ev_isr,
+	i2c1_er_isr,
+	i2c2_ev_isr,
+	i2c2_er_isr,
+	spi1_isr,
+	spi2_isr,
+	usart1_isr,
+	usart2_isr,
+	usart3_isr,
+	exti15_10_isr,
+	rtc_alarm_isr,
+	usb_fs_wkup_isr,
+	tim8_brk_tim12_isr,
+	tim8_up_tim13_isr,
+	tim8_trg_com_tim14_isr,
+	tim8_cc_isr,
+	dma1_stream7_isr,
+	fsmc_isr,
+	sdio_isr,
+	tim5_isr,
+	spi3_isr,
+	usart4_isr,
+	usart5_isr,
+	tim6_dac_isr,
+	tim7_isr,
+	dma2_stream0_isr,
+	dma2_stream1_isr,
+	dma2_stream2_isr,
+	dma2_stream3_isr,
+	dma2_stream4_isr,
+	eth_isr,
+	eth_wkup_isr,
+	can2_tx_isr,
+	can2_rx0_isr,
+	can2_rx1_isr,
+	can2_sce_isr,
+	otg_fs_isr,
+	dma2_stream5_isr,
+	dma2_stream6_isr,
+	dma2_stream7_isr,
+  usart6_isr,
+	i2c3_ev_isr,
+	i2c3_er_isr,
+  otg_hs_ep1_out_isr,
+	otg_hs_ep1_in_isr,
+	otg_hs_wkup_isr,
+	otg_hs_isr,
+	dcmi_isr,
+	cryp_isr,
+	hash_rng_isr,
+};
+
+void reset_handler(void)
+{
+	volatile unsigned *src, *dest;
+	asm("MSR msp, %0" : : "r"(&_stack));
+
+	for (src = &_etext, dest = &_data; dest < &_edata; src++, dest++)
+		*dest = *src;
+
+	while (dest < &_ebss)
+		*dest++ = 0;
+
+	/* Call the application's entry point. */
+	main();
+}
+
+void blocking_handler(void)
+{
+	while (1) ;
+}
+
+void null_handler(void)
+{
+	/* Do nothing. */
+}
+
+#pragma weak nmi_handler = null_handler
+#pragma weak hard_fault_handler = blocking_handler
+#pragma weak mem_manage_handler = blocking_handler
+#pragma weak bus_fault_handler = blocking_handler
+#pragma weak usage_fault_handler = blocking_handler
+#pragma weak sv_call_handler = null_handler
+#pragma weak debug_monitor_handler = null_handler
+#pragma weak pend_sv_handler = null_handler
+#pragma weak sys_tick_handler = null_handler
+#pragma weak wwdg_isr = null_handler
+#pragma weak pvd_isr = null_handler
+#pragma weak tamp_stamp_isr = null_handler
+#pragma weak rtc_wkup_isr = null_handler
+#pragma weak flash_isr = null_handler
+#pragma weak rcc_isr = null_handler
+#pragma weak exti0_isr = null_handler
+#pragma weak exti1_isr = null_handler
+#pragma weak exti2_isr = null_handler
+#pragma weak exti3_isr = null_handler
+#pragma weak exti4_isr = null_handler
+#pragma weak dma1_stream0_isr = null_handler
+#pragma weak dma1_stream1_isr = null_handler
+#pragma weak dma1_stream2_isr = null_handler
+#pragma weak dma1_stream3_isr = null_handler
+#pragma weak dma1_stream4_isr = null_handler
+#pragma weak dma1_stream5_isr = null_handler
+#pragma weak dma1_stream6_isr = null_handler
+#pragma weak adc_isr = null_handler
+#pragma weak can1_tx_isr = null_handler
+#pragma weak can1_rx0_isr = null_handler
+#pragma weak can1_rx1_isr = null_handler
+#pragma weak can1_sce_isr = null_handler
+#pragma weak exti9_5_isr = null_handler
+#pragma weak tim1_brk_tim9_isr = null_handler
+#pragma weak tim1_up_tim10_isr = null_handler
+#pragma weak tim1_trg_com_tim11_isr = null_handler
+#pragma weak tim1_cc_isr = null_handler
+#pragma weak tim2_isr = null_handler
+#pragma weak tim3_isr = null_handler
+#pragma weak tim4_isr = null_handler
+#pragma weak i2c1_ev_isr = null_handler
+#pragma weak i2c1_er_isr = null_handler
+#pragma weak i2c2_ev_isr = null_handler
+#pragma weak i2c2_er_isr = null_handler
+#pragma weak spi1_isr = null_handler
+#pragma weak spi2_isr = null_handler
+#pragma weak usart1_isr = null_handler
+#pragma weak usart2_isr = null_handler
+#pragma weak usart3_isr = null_handler
+#pragma weak exti15_10_isr = null_handler
+#pragma weak rtc_alarm_isr = null_handler
+#pragma weak usb_fs_wkup_isr = null_handler
+#pragma weak tim8_brk_tim12_isr = null_handler
+#pragma weak tim8_up_tim13_isr = null_handler
+#pragma weak tim8_trg_com_tim14_isr = null_handler
+#pragma weak tim8_cc_isr = null_handler
+#pragma weak dma1_stream7_isr = null_handler
+#pragma weak fsmc_isr = null_handler
+#pragma weak sdio_isr = null_handler
+#pragma weak tim5_isr = null_handler
+#pragma weak spi3_isr = null_handler
+#pragma weak usart4_isr = null_handler
+#pragma weak usart5_isr = null_handler
+#pragma weak tim6_dac_isr = null_handler
+#pragma weak tim7_isr = null_handler
+#pragma weak dma2_stream0_isr = null_handler
+#pragma weak dma2_stream1_isr = null_handler
+#pragma weak dma2_stream2_isr = null_handler
+#pragma weak dma2_stream3_isr = null_handler
+#pragma weak dma2_stream4_isr = null_handler
+#pragma weak eth_isr = null_handler
+#pragma weak eth_wkup_isr = null_handler
+#pragma weak can2_tx_isr = null_handler
+#pragma weak can2_rx0_isr = null_handler
+#pragma weak can2_rx1_isr = null_handler
+#pragma weak can2_sce_isr = null_handler
+#pragma weak otg_fs_isr = null_handler
+#pragma weak dma2_stream5_isr = null_handler
+#pragma weak dma2_stream6_isr = null_handler
+#pragma weak dma2_stream7_isr = null_handler
+#pragma weak usart6_isr = null_handler
+#pragma weak i2c3_ev_isr = null_handler
+#pragma weak i2c3_er_isr = null_handler
+#pragma weak otg_hs_ep1_out_isr = null_handler
+#pragma weak otg_hs_ep1_in_isr = null_handler
+#pragma weak otg_hs_wkup_isr = null_handler
+#pragma weak otg_hs_isr = null_handler
+#pragma weak dcmi_isr = null_handler
+#pragma weak cryp_isr = null_handler
+#pragma weak hash_rng_isr = null_handler
+

From 666b8f12d56cf478b0c9594009004b88917dec64 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 01:17:45 -0700
Subject: [PATCH 26/51] Fixing something I forgot to update after restructuring
 the include directories.

---
 include/libopencm3/stm32/memorymap.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/libopencm3/stm32/memorymap.h b/include/libopencm3/stm32/memorymap.h
index 17a919ef..63f2ef09 100644
--- a/include/libopencm3/stm32/memorymap.h
+++ b/include/libopencm3/stm32/memorymap.h
@@ -21,10 +21,10 @@
 #define LIBOPENCM3_MEMORYMAP_COMMON_H
 
 #ifdef STM32F1
-#include <libopencm3/stm32f1/memorymap.h>
+#include <libopencm3/stm32/f1/memorymap.h>
 #else
-#ifdef STM32F1
-#include <libopencm3/stm32f2/memorymap.h>
+#ifdef STM32F2
+#include <libopencm3/stm32/f2/memorymap.h>
 #else
 #error "stm32 family not defined."
 #endif

From a4935eef571191f7c9170723943f1327d39656a1 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 01:18:26 -0700
Subject: [PATCH 27/51] Add family define for the F1 Makefile and add a
 Makefile for the F2.

---
 lib/stm32f1/Makefile |  2 +-
 lib/stm32f2/Makefile | 58 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 lib/stm32f2/Makefile

diff --git a/lib/stm32f1/Makefile b/lib/stm32f1/Makefile
index 3d154aa8..fa4dad14 100644
--- a/lib/stm32f1/Makefile
+++ b/lib/stm32f1/Makefile
@@ -25,7 +25,7 @@ CC		= $(PREFIX)-gcc
 AR		= $(PREFIX)-ar
 CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
 		  -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \
-		  -ffunction-sections -fdata-sections -MD
+		  -ffunction-sections -fdata-sections -MD -DSTM32F1
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
 OBJS		= vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \
diff --git a/lib/stm32f2/Makefile b/lib/stm32f2/Makefile
new file mode 100644
index 00000000..1f08089b
--- /dev/null
+++ b/lib/stm32f2/Makefile
@@ -0,0 +1,58 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+LIBNAME		= libopencm3_stm32f2
+
+# PREFIX	?= arm-none-eabi
+PREFIX		?= arm-elf
+CC		= $(PREFIX)-gcc
+AR		= $(PREFIX)-ar
+CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
+		  -mcpu=cortex-m3 -mthumb -Wstrict-prototypes \
+		  -ffunction-sections -fdata-sections -MD -DSTM32F2
+# ARFLAGS	= rcsv
+ARFLAGS		= rcs
+OBJS		= vector.o gpio.o
+
+#VPATH += ../usb
+
+# Be silent per default, but 'make V=1' will show all compiler calls.
+ifneq ($(V),1)
+Q := @
+endif
+
+all: $(LIBNAME).a
+
+$(LIBNAME).a: $(OBJS)
+	@printf "  AR      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(AR) $(ARFLAGS) $@ $^
+
+%.o: %.c
+	@printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(CC) $(CFLAGS) -o $@ -c $<
+
+clean:
+	@printf "  CLEAN   lib/stm32f2\n"
+	$(Q)rm -f *.o *.d
+	$(Q)rm -f $(LIBNAME).a
+
+.PHONY: clean
+
+-include $(OBJS:.o=.d)
+

From ce7dd46aef9153c4f98a983977ce7bd2a905134d Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 01:18:49 -0700
Subject: [PATCH 28/51] Update F1 libs with new header file locations.

---
 lib/stm32f1/adc.c      |  2 +-
 lib/stm32f1/can.c      |  2 +-
 lib/stm32f1/dma.c      |  2 +-
 lib/stm32f1/ethernet.c |  2 +-
 lib/stm32f1/exti.c     |  2 +-
 lib/stm32f1/flash.c    |  2 +-
 lib/stm32f1/gpio.c     |  2 +-
 lib/stm32f1/nvic.c     |  2 +-
 lib/stm32f1/rcc.c      |  4 ++--
 lib/stm32f1/rtc.c      |  4 ++--
 lib/stm32f1/systick.c  |  2 +-
 lib/stm32f1/timer.c    |  2 +-
 lib/stm32f1/usart.c    |  2 +-
 lib/stm32f2/gpio.c     | 10 +++++-----
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/stm32f1/adc.c b/lib/stm32f1/adc.c
index 058837c3..31e4cbfa 100644
--- a/lib/stm32f1/adc.c
+++ b/lib/stm32f1/adc.c
@@ -31,7 +31,7 @@
  *  reg16 = adc_read(ADC1, ADC_CH_0);
  */
 
-#include <libopencm3/stm32/adc.h>
+#include <libopencm3/stm32/f1/adc.h>
 
 void rcc_set_adc_clk(u32 prescaler)
 {
diff --git a/lib/stm32f1/can.c b/lib/stm32f1/can.c
index e571f8a2..8c5d7ec5 100644
--- a/lib/stm32f1/can.c
+++ b/lib/stm32f1/can.c
@@ -18,7 +18,7 @@
  */
 
 #include <libopencm3/stm32/can.h>
-#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f1/rcc.h>
 
 void can_reset(u32 canport)
 {
diff --git a/lib/stm32f1/dma.c b/lib/stm32f1/dma.c
index 8feb2c95..4f0af6ff 100644
--- a/lib/stm32f1/dma.c
+++ b/lib/stm32f1/dma.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/dma.h>
+#include <libopencm3/stm32/f1/dma.h>
 
 void dma_enable_mem2mem_mode(u32 dma, u8 channel)
 {
diff --git a/lib/stm32f1/ethernet.c b/lib/stm32f1/ethernet.c
index 4a4d080a..fc65ec2f 100644
--- a/lib/stm32f1/ethernet.c
+++ b/lib/stm32f1/ethernet.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/ethernet.h>
+#include <libopencm3/stm32/f1/ethernet.h>
 
 void eth_smi_write(u8 phy, u8 reg, u16 data)
 {
diff --git a/lib/stm32f1/exti.c b/lib/stm32f1/exti.c
index de037e7a..969cae4c 100644
--- a/lib/stm32f1/exti.c
+++ b/lib/stm32f1/exti.c
@@ -18,7 +18,7 @@
  */
 
 #include <libopencm3/stm32/exti.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 void exti_set_trigger(u32 extis, exti_trigger_type trig)
 {
diff --git a/lib/stm32f1/flash.c b/lib/stm32f1/flash.c
index 98f77776..b8b3d526 100644
--- a/lib/stm32f1/flash.c
+++ b/lib/stm32f1/flash.c
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/f1/flash.h>
 
 void flash_prefetch_buffer_enable(void)
 {
diff --git a/lib/stm32f1/gpio.c b/lib/stm32f1/gpio.c
index 52c0c66c..cd6be9bf 100644
--- a/lib/stm32f1/gpio.c
+++ b/lib/stm32f1/gpio.c
@@ -34,7 +34,7 @@
  *  - GPIO remapping support
  */
 
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 void gpio_set_mode(u32 gpioport, u8 mode, u8 cnf, u16 gpios)
 {
diff --git a/lib/stm32f1/nvic.c b/lib/stm32f1/nvic.c
index cf77cc38..f45b601b 100644
--- a/lib/stm32f1/nvic.c
+++ b/lib/stm32f1/nvic.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/f1/nvic.h>
 
 void nvic_enable_irq(u8 irqn)
 {
diff --git a/lib/stm32f1/rcc.c b/lib/stm32f1/rcc.c
index f646168d..689cabb9 100644
--- a/lib/stm32f1/rcc.c
+++ b/lib/stm32f1/rcc.c
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
 
 /* Set the default ppre1 and ppre2 peripheral clock frequencies after reset */
 u32 rcc_ppre1_frequency = 8000000;
diff --git a/lib/stm32f1/rtc.c b/lib/stm32f1/rtc.c
index 44956418..c187be97 100644
--- a/lib/stm32f1/rtc.c
+++ b/lib/stm32f1/rtc.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/rtc.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/rtc.h>
 #include <libopencm3/stm32/pwr.h>
 
 void rtc_awake_from_off(osc_t clock_source)
diff --git a/lib/stm32f1/systick.c b/lib/stm32f1/systick.c
index 882601da..3308413b 100644
--- a/lib/stm32f1/systick.c
+++ b/lib/stm32f1/systick.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/systick.h>
+#include <libopencm3/stm32/f1/systick.h>
 
 void systick_set_reload(u32 value)
 {
diff --git a/lib/stm32f1/timer.c b/lib/stm32f1/timer.c
index 32e240d1..a61f67fa 100644
--- a/lib/stm32f1/timer.c
+++ b/lib/stm32f1/timer.c
@@ -26,7 +26,7 @@
  */
 
 #include <libopencm3/stm32/timer.h>
-#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f1/rcc.h>
 
 void timer_reset(u32 timer_peripheral)
 {
diff --git a/lib/stm32f1/usart.c b/lib/stm32f1/usart.c
index ead0ef7a..73e450b2 100644
--- a/lib/stm32f1/usart.c
+++ b/lib/stm32f1/usart.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f1/rcc.h>
 
 #include <libopencm3/stm32/usart.h>
 
diff --git a/lib/stm32f2/gpio.c b/lib/stm32f2/gpio.c
index f2ea55a5..23306286 100644
--- a/lib/stm32f2/gpio.c
+++ b/lib/stm32f2/gpio.c
@@ -77,9 +77,9 @@ void gpio_set_output_options(u32 gpioport, u8 otype, u8 speed, u16 gpios)
 	
 	for (i = 0; i < 16; i++) {
 		if (!((1 << i) & gpios))
-			continue
-		ospeedr &= ~GPIO_OSPEEDR_MASK(i);
-		ospeedr |= GPIO_OSPEEDR(i, mode);
+			continue;
+		ospeedr &= ~GPIO_OSPEED_MASK(i);
+		ospeedr |= GPIO_OSPEED(i, speed);
 	}
 
 	GPIO_OSPEEDR(gpioport) = ospeedr;
@@ -95,14 +95,14 @@ void gpio_set_af(u32 gpioport, u8 alt_func_num, u16 gpios)
 
 	for (i = 0; i < 8; i++) {
 		if (!((1 << i) & gpios))
-			continue
+			continue;
 		afrl &= GPIO_AFR_MASK(i);
 		afrl |= GPIO_AFR(i, alt_func_num);
 	}
 
 	for (i = 8; i < 16; i++) {
 		if (!((1 << i) & gpios))
-			continue
+			continue;
 		afrl &= GPIO_AFR_MASK(i-8);
 		afrh |= GPIO_AFR(i-8, alt_func_num);
 	}

From cff706e3ca3823ffb388a4e87c4ef8bf925945c4 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 01:20:45 -0700
Subject: [PATCH 29/51] Rename F1 examples folder.

---
 examples/stm32f1/Makefile.include             | 127 ++++++++++++++++++
 .../lisa-m/fancyblink/Makefile                |   0
 .../lisa-m/fancyblink/fancyblink.c            |   0
 .../lisa-m/fancyblink/fancyblink.ld           |   0
 .../lisa-m/usb_dfu/Makefile                   |   0
 .../{stm32 => stm32f1}/lisa-m/usb_dfu/README  |   0
 .../lisa-m/usb_dfu/usbdfu.c                   |   0
 .../lisa-m/usb_dfu/usbdfu.ld                  |   0
 .../lisa-m/usb_hid/Makefile                   |   0
 .../{stm32 => stm32f1}/lisa-m/usb_hid/README  |   0
 .../lisa-m/usb_hid/usbhid.c                   |   0
 .../lisa-m/usb_hid/usbhid.ld                  |   0
 .../mb525/fancyblink/Makefile                 |   0
 .../mb525/fancyblink/README                   |   0
 .../mb525/fancyblink/fancyblink.c             |   0
 .../mb525/fancyblink/fancyblink.ld            |   0
 .../{stm32 => stm32f1}/mb525/pwmleds/Makefile |   0
 .../{stm32 => stm32f1}/mb525/pwmleds/README   |   0
 .../mb525/pwmleds/pwmleds.c                   |   0
 .../mb525/pwmleds/pwmleds.ld                  |   0
 .../{stm32 => stm32f1}/obldc/can/Makefile     |   0
 examples/{stm32 => stm32f1}/obldc/can/can.c   |   0
 examples/{stm32 => stm32f1}/obldc/can/can.ld  |   0
 .../{stm32 => stm32f1}/obldc/led/Makefile     |   0
 examples/{stm32 => stm32f1}/obldc/led/led.c   |   0
 examples/{stm32 => stm32f1}/obldc/led/led.ld  |   0
 .../{stm32 => stm32f1}/obldc/pwmleds/Makefile |   0
 .../obldc/pwmleds/pwmleds.c                   |   0
 .../obldc/pwmleds/pwmleds.ld                  |   0
 .../{stm32 => stm32f1}/obldc/systick/Makefile |   0
 .../obldc/systick/systick.c                   |   0
 .../obldc/systick/systick.ld                  |   0
 .../{stm32 => stm32f1}/obldc/usart/Makefile   |   0
 .../{stm32 => stm32f1}/obldc/usart/usart.c    |   0
 .../{stm32 => stm32f1}/obldc/usart/usart.ld   |   0
 .../obldc/usart_irq/Makefile                  |   0
 .../obldc/usart_irq/usart_irq.c               |   0
 .../obldc/usart_irq/usart_irq.ld              |   0
 .../other/adc_temperature_sensor/Makefile     |   0
 .../other/adc_temperature_sensor/README       |   0
 .../other/adc_temperature_sensor/adc.c        |   0
 .../other/adc_temperature_sensor/adc.ld       |   0
 .../other/dma_mem2mem/Makefile                |   0
 .../other/dma_mem2mem/README                  |   0
 .../other/dma_mem2mem/dma.c                   |   0
 .../other/dma_mem2mem/dma.ld                  |   0
 .../{stm32 => stm32f1}/other/dogm128/Makefile |   0
 .../{stm32 => stm32f1}/other/dogm128/README   |   0
 .../other/dogm128/dogm128.c                   |   0
 .../other/dogm128/dogm128.h                   |   0
 .../{stm32 => stm32f1}/other/dogm128/main.c   |   0
 .../{stm32 => stm32f1}/other/dogm128/main.ld  |   0
 .../other/i2c_stts75_sensor/Makefile          |   0
 .../other/i2c_stts75_sensor/README            |   0
 .../i2c_stts75_sensor/i2c_stts75_sensor.c     |   0
 .../i2c_stts75_sensor/i2c_stts75_sensor.ld    |   0
 .../other/i2c_stts75_sensor/stts75.c          |   0
 .../other/i2c_stts75_sensor/stts75.h          |   0
 .../{stm32 => stm32f1}/other/rtc/Makefile     |   0
 examples/{stm32 => stm32f1}/other/rtc/README  |   0
 examples/{stm32 => stm32f1}/other/rtc/rtc.c   |   0
 examples/{stm32 => stm32f1}/other/rtc/rtc.ld  |   0
 .../{stm32 => stm32f1}/other/systick/Makefile |   0
 .../{stm32 => stm32f1}/other/systick/README   |   0
 .../other/systick/systick.c                   |   0
 .../other/systick/systick.ld                  |   0
 .../other/timer_interrupt/Makefile            |   0
 .../other/timer_interrupt/README              |   0
 .../other/timer_interrupt/timer.c             |   0
 .../other/timer_interrupt/timer.ld            |   0
 .../other/usb_cdcacm/Makefile                 |   0
 .../other/usb_cdcacm/README                   |   0
 .../other/usb_cdcacm/cdcacm.c                 |   0
 .../other/usb_cdcacm/cdcacm.ld                |   0
 .../{stm32 => stm32f1}/other/usb_dfu/Makefile |   0
 .../{stm32 => stm32f1}/other/usb_dfu/README   |   0
 .../{stm32 => stm32f1}/other/usb_dfu/usbdfu.c |   0
 .../other/usb_dfu/usbdfu.ld                   |   0
 .../{stm32 => stm32f1}/other/usb_hid/Makefile |   0
 .../{stm32 => stm32f1}/other/usb_hid/README   |   0
 .../{stm32 => stm32f1}/other/usb_hid/usbhid.c |   0
 .../other/usb_hid/usbhid.ld                   |   0
 .../stm32-discovery/button/Makefile           |   0
 .../stm32-discovery/button/README             |   0
 .../stm32-discovery/button/button.c           |   0
 .../stm32-discovery/button/button.ld          |   0
 .../stm32-discovery/fancyblink/Makefile       |   0
 .../stm32-discovery/fancyblink/README         |   0
 .../stm32-discovery/fancyblink/fancyblink.c   |   0
 .../stm32-discovery/fancyblink/fancyblink.ld  |   0
 .../stm32-discovery/miniblink/Makefile        |   0
 .../stm32-discovery/miniblink/README          |   0
 .../stm32-discovery/miniblink/miniblink.c     |   0
 .../stm32-discovery/miniblink/miniblink.ld    |   0
 .../stm32-discovery/rtc/Makefile              |   0
 .../stm32-discovery/rtc/README                |   0
 .../stm32-discovery/rtc/rtc.c                 |   0
 .../stm32-discovery/rtc/rtc.ld                |   0
 .../stm32-discovery/usart/Makefile            |   0
 .../stm32-discovery/usart/README              |   0
 .../stm32-discovery/usart/usart.c             |   0
 .../stm32-discovery/usart/usart.ld            |   0
 .../stm32-h103/button/Makefile                |   0
 .../stm32-h103/button/button.c                |   0
 .../stm32-h103/button/button.ld               |   0
 .../stm32-h103/exti_both/Makefile             |   0
 .../stm32-h103/exti_both/exti_both.c          |   0
 .../stm32-h103/exti_both/exti_both.ld         |   0
 .../stm32-h103/exti_rising_falling/Makefile   |   0
 .../exti_rising_falling/exti_rising_falling.c |   0
 .../exti_rising_falling.ld                    |   0
 .../stm32-h103/fancyblink/Makefile            |   0
 .../stm32-h103/fancyblink/README              |   0
 .../stm32-h103/fancyblink/fancyblink.c        |   0
 .../stm32-h103/fancyblink/fancyblink.ld       |   0
 .../stm32-h103/led_stripe/Makefile            |   0
 .../stm32-h103/led_stripe/led_stripe.c        |   0
 .../stm32-h103/led_stripe/led_stripe.ld       |   0
 .../stm32-h103/miniblink/Makefile             |   0
 .../stm32-h103/miniblink/README               |   0
 .../stm32-h103/miniblink/miniblink.c          |   0
 .../stm32-h103/miniblink/miniblink.ld         |   0
 .../stm32-h103/pwm_6step/Makefile             |   0
 .../stm32-h103/pwm_6step/pwm_6step.c          |   0
 .../stm32-h103/pwm_6step/pwm_6step.ld         |   0
 .../stm32-h103/spi/Makefile                   |   0
 .../{stm32 => stm32f1}/stm32-h103/spi/README  |   0
 .../{stm32 => stm32f1}/stm32-h103/spi/spi.c   |   0
 .../{stm32 => stm32f1}/stm32-h103/spi/spi.ld  |   0
 .../stm32-h103/timer/Makefile                 |   0
 .../stm32-h103/timer/timer.c                  |   0
 .../stm32-h103/timer/timer.ld                 |   0
 .../stm32-h103/traceswo/Makefile              |   0
 .../stm32-h103/traceswo/README                |   0
 .../stm32-h103/traceswo/traceswo.c            |   0
 .../stm32-h103/traceswo/traceswo.ld           |   0
 .../stm32-h103/usart/Makefile                 |   0
 .../stm32-h103/usart/README                   |   0
 .../stm32-h103/usart/usart.c                  |   0
 .../stm32-h103/usart/usart.ld                 |   0
 .../stm32-h103/usart_irq/Makefile             |   0
 .../stm32-h103/usart_irq/usart_irq.c          |   0
 .../stm32-h103/usart_irq/usart_irq.ld         |   0
 .../stm32-h103/usart_irq_printf/Makefile      |   0
 .../usart_irq_printf/usart_irq_printf.c       |   0
 .../usart_irq_printf/usart_irq_printf.ld      |   0
 .../stm32-h103/usart_printf/Makefile          |   0
 .../stm32-h103/usart_printf/usart_printf.c    |   0
 .../stm32-h103/usart_printf/usart_printf.ld   |   0
 .../stm32-h103/usb_cdcacm/Makefile            |   0
 .../stm32-h103/usb_cdcacm/README              |   0
 .../stm32-h103/usb_cdcacm/cdcacm.c            |   0
 .../stm32-h103/usb_cdcacm/cdcacm.ld           |   0
 .../stm32-h103/usb_dfu/Makefile               |   0
 .../stm32-h103/usb_dfu/README                 |   0
 .../stm32-h103/usb_dfu/usbdfu.c               |   0
 .../stm32-h103/usb_dfu/usbdfu.ld              |   0
 .../stm32-h103/usb_hid/Makefile               |   0
 .../stm32-h103/usb_hid/README                 |   0
 .../stm32-h103/usb_hid/usbhid.c               |   0
 .../stm32-h103/usb_hid/usbhid.ld              |   0
 .../stm32-h103/usb_iap/Makefile               |   0
 .../stm32-h103/usb_iap/README                 |   0
 .../stm32-h103/usb_iap/usbiap.c               |   0
 .../stm32-h103/usb_iap/usbiap.ld              |   0
 .../stm32-h107/fancyblink/Makefile            |   0
 .../stm32-h107/fancyblink/README              |   0
 .../stm32-h107/fancyblink/fancyblink.c        |   0
 .../stm32-h107/fancyblink/fancyblink.ld       |   0
 .../stm32-h107/usb_simple/Makefile            |   0
 .../stm32-h107/usb_simple/README              |   0
 .../stm32-h107/usb_simple/usb_simple.c        |   0
 .../stm32-h107/usb_simple/usb_simple.ld       |   0
 173 files changed, 127 insertions(+)
 create mode 100644 examples/stm32f1/Makefile.include
 rename examples/{stm32 => stm32f1}/lisa-m/fancyblink/Makefile (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/fancyblink/fancyblink.c (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/fancyblink/fancyblink.ld (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/usb_dfu/Makefile (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/usb_dfu/README (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/usb_dfu/usbdfu.c (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/usb_dfu/usbdfu.ld (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/usb_hid/Makefile (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/usb_hid/README (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/usb_hid/usbhid.c (100%)
 rename examples/{stm32 => stm32f1}/lisa-m/usb_hid/usbhid.ld (100%)
 rename examples/{stm32 => stm32f1}/mb525/fancyblink/Makefile (100%)
 rename examples/{stm32 => stm32f1}/mb525/fancyblink/README (100%)
 rename examples/{stm32 => stm32f1}/mb525/fancyblink/fancyblink.c (100%)
 rename examples/{stm32 => stm32f1}/mb525/fancyblink/fancyblink.ld (100%)
 rename examples/{stm32 => stm32f1}/mb525/pwmleds/Makefile (100%)
 rename examples/{stm32 => stm32f1}/mb525/pwmleds/README (100%)
 rename examples/{stm32 => stm32f1}/mb525/pwmleds/pwmleds.c (100%)
 rename examples/{stm32 => stm32f1}/mb525/pwmleds/pwmleds.ld (100%)
 rename examples/{stm32 => stm32f1}/obldc/can/Makefile (100%)
 rename examples/{stm32 => stm32f1}/obldc/can/can.c (100%)
 rename examples/{stm32 => stm32f1}/obldc/can/can.ld (100%)
 rename examples/{stm32 => stm32f1}/obldc/led/Makefile (100%)
 rename examples/{stm32 => stm32f1}/obldc/led/led.c (100%)
 rename examples/{stm32 => stm32f1}/obldc/led/led.ld (100%)
 rename examples/{stm32 => stm32f1}/obldc/pwmleds/Makefile (100%)
 rename examples/{stm32 => stm32f1}/obldc/pwmleds/pwmleds.c (100%)
 rename examples/{stm32 => stm32f1}/obldc/pwmleds/pwmleds.ld (100%)
 rename examples/{stm32 => stm32f1}/obldc/systick/Makefile (100%)
 rename examples/{stm32 => stm32f1}/obldc/systick/systick.c (100%)
 rename examples/{stm32 => stm32f1}/obldc/systick/systick.ld (100%)
 rename examples/{stm32 => stm32f1}/obldc/usart/Makefile (100%)
 rename examples/{stm32 => stm32f1}/obldc/usart/usart.c (100%)
 rename examples/{stm32 => stm32f1}/obldc/usart/usart.ld (100%)
 rename examples/{stm32 => stm32f1}/obldc/usart_irq/Makefile (100%)
 rename examples/{stm32 => stm32f1}/obldc/usart_irq/usart_irq.c (100%)
 rename examples/{stm32 => stm32f1}/obldc/usart_irq/usart_irq.ld (100%)
 rename examples/{stm32 => stm32f1}/other/adc_temperature_sensor/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/adc_temperature_sensor/README (100%)
 rename examples/{stm32 => stm32f1}/other/adc_temperature_sensor/adc.c (100%)
 rename examples/{stm32 => stm32f1}/other/adc_temperature_sensor/adc.ld (100%)
 rename examples/{stm32 => stm32f1}/other/dma_mem2mem/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/dma_mem2mem/README (100%)
 rename examples/{stm32 => stm32f1}/other/dma_mem2mem/dma.c (100%)
 rename examples/{stm32 => stm32f1}/other/dma_mem2mem/dma.ld (100%)
 rename examples/{stm32 => stm32f1}/other/dogm128/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/dogm128/README (100%)
 rename examples/{stm32 => stm32f1}/other/dogm128/dogm128.c (100%)
 rename examples/{stm32 => stm32f1}/other/dogm128/dogm128.h (100%)
 rename examples/{stm32 => stm32f1}/other/dogm128/main.c (100%)
 rename examples/{stm32 => stm32f1}/other/dogm128/main.ld (100%)
 rename examples/{stm32 => stm32f1}/other/i2c_stts75_sensor/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/i2c_stts75_sensor/README (100%)
 rename examples/{stm32 => stm32f1}/other/i2c_stts75_sensor/i2c_stts75_sensor.c (100%)
 rename examples/{stm32 => stm32f1}/other/i2c_stts75_sensor/i2c_stts75_sensor.ld (100%)
 rename examples/{stm32 => stm32f1}/other/i2c_stts75_sensor/stts75.c (100%)
 rename examples/{stm32 => stm32f1}/other/i2c_stts75_sensor/stts75.h (100%)
 rename examples/{stm32 => stm32f1}/other/rtc/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/rtc/README (100%)
 rename examples/{stm32 => stm32f1}/other/rtc/rtc.c (100%)
 rename examples/{stm32 => stm32f1}/other/rtc/rtc.ld (100%)
 rename examples/{stm32 => stm32f1}/other/systick/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/systick/README (100%)
 rename examples/{stm32 => stm32f1}/other/systick/systick.c (100%)
 rename examples/{stm32 => stm32f1}/other/systick/systick.ld (100%)
 rename examples/{stm32 => stm32f1}/other/timer_interrupt/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/timer_interrupt/README (100%)
 rename examples/{stm32 => stm32f1}/other/timer_interrupt/timer.c (100%)
 rename examples/{stm32 => stm32f1}/other/timer_interrupt/timer.ld (100%)
 rename examples/{stm32 => stm32f1}/other/usb_cdcacm/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/usb_cdcacm/README (100%)
 rename examples/{stm32 => stm32f1}/other/usb_cdcacm/cdcacm.c (100%)
 rename examples/{stm32 => stm32f1}/other/usb_cdcacm/cdcacm.ld (100%)
 rename examples/{stm32 => stm32f1}/other/usb_dfu/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/usb_dfu/README (100%)
 rename examples/{stm32 => stm32f1}/other/usb_dfu/usbdfu.c (100%)
 rename examples/{stm32 => stm32f1}/other/usb_dfu/usbdfu.ld (100%)
 rename examples/{stm32 => stm32f1}/other/usb_hid/Makefile (100%)
 rename examples/{stm32 => stm32f1}/other/usb_hid/README (100%)
 rename examples/{stm32 => stm32f1}/other/usb_hid/usbhid.c (100%)
 rename examples/{stm32 => stm32f1}/other/usb_hid/usbhid.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/button/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/button/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/button/button.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/button/button.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/fancyblink/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/fancyblink/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/fancyblink/fancyblink.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/fancyblink/fancyblink.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/miniblink/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/miniblink/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/miniblink/miniblink.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/miniblink/miniblink.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/rtc/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/rtc/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/rtc/rtc.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/rtc/rtc.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/usart/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/usart/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/usart/usart.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-discovery/usart/usart.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/button/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/button/button.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/button/button.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/exti_both/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/exti_both/exti_both.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/exti_both/exti_both.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/exti_rising_falling/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/exti_rising_falling/exti_rising_falling.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/exti_rising_falling/exti_rising_falling.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/fancyblink/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/fancyblink/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/fancyblink/fancyblink.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/fancyblink/fancyblink.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/led_stripe/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/led_stripe/led_stripe.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/led_stripe/led_stripe.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/miniblink/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/miniblink/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/miniblink/miniblink.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/miniblink/miniblink.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/pwm_6step/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/pwm_6step/pwm_6step.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/pwm_6step/pwm_6step.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/spi/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/spi/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/spi/spi.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/spi/spi.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/timer/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/timer/timer.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/timer/timer.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/traceswo/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/traceswo/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/traceswo/traceswo.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/traceswo/traceswo.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart/usart.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart/usart.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart_irq/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart_irq/usart_irq.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart_irq/usart_irq.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart_irq_printf/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart_irq_printf/usart_irq_printf.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart_irq_printf/usart_irq_printf.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart_printf/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart_printf/usart_printf.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usart_printf/usart_printf.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_cdcacm/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_cdcacm/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_cdcacm/cdcacm.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_cdcacm/cdcacm.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_dfu/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_dfu/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_dfu/usbdfu.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_dfu/usbdfu.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_hid/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_hid/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_hid/usbhid.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_hid/usbhid.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_iap/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_iap/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_iap/usbiap.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h103/usb_iap/usbiap.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h107/fancyblink/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h107/fancyblink/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h107/fancyblink/fancyblink.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h107/fancyblink/fancyblink.ld (100%)
 rename examples/{stm32 => stm32f1}/stm32-h107/usb_simple/Makefile (100%)
 rename examples/{stm32 => stm32f1}/stm32-h107/usb_simple/README (100%)
 rename examples/{stm32 => stm32f1}/stm32-h107/usb_simple/usb_simple.c (100%)
 rename examples/{stm32 => stm32f1}/stm32-h107/usb_simple/usb_simple.ld (100%)

diff --git a/examples/stm32f1/Makefile.include b/examples/stm32f1/Makefile.include
new file mode 100644
index 00000000..221ebaea
--- /dev/null
+++ b/examples/stm32f1/Makefile.include
@@ -0,0 +1,127 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2010 Piotr Esden-Tempski <piotr@esden.net>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+PREFIX	?= arm-none-eabi
+#PREFIX		?= arm-elf
+CC		= $(PREFIX)-gcc
+LD		= $(PREFIX)-gcc
+OBJCOPY		= $(PREFIX)-objcopy
+OBJDUMP		= $(PREFIX)-objdump
+# Uncomment this line if you want to use the installed (not local) library.
+TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
+#TOOLCHAIN_DIR   = ../../../..
+CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
+		   -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD
+LDSCRIPT	= $(BINARY).ld
+LDFLAGS		+= -lc -lnosys -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32 \
+		   -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \
+		   -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
+OBJS		+= $(BINARY).o
+
+OOCD		?= openocd
+OOCD_INTERFACE	?= flossjtag
+OOCD_BOARD	?= olimex_stm32_h103
+
+# Be silent per default, but 'make V=1' will show all compiler calls.
+ifneq ($(V),1)
+Q := @
+NULL := 2>/dev/null
+else
+LDFLAGS += -Wl,--print-gc-sections
+endif
+
+.SUFFIXES: .elf .bin .hex .srec .list .images
+.SECONDEXPANSION:
+.SECONDARY:
+
+all: images
+
+images: $(BINARY).images
+flash: $(BINARY).flash
+
+%.images: %.bin %.hex %.srec %.list
+	@#echo "*** $* images generated ***"
+
+%.bin: %.elf
+	@#printf "  OBJCOPY $(*).bin\n"
+	$(Q)$(OBJCOPY) -Obinary $(*).elf $(*).bin
+
+%.hex: %.elf
+	@#printf "  OBJCOPY $(*).hex\n"
+	$(Q)$(OBJCOPY) -Oihex $(*).elf $(*).hex
+
+%.srec: %.elf
+	@#printf "  OBJCOPY $(*).srec\n"
+	$(Q)$(OBJCOPY) -Osrec $(*).elf $(*).srec
+
+%.list: %.elf
+	@#printf "  OBJDUMP $(*).list\n"
+	$(Q)$(OBJDUMP) -S $(*).elf > $(*).list
+
+foo.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32.a
+	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(LD) -o foo.elf $(OBJS) -lopencm3_stm32 $(LDFLAGS)
+
+%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32.a
+	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32 $(LDFLAGS)
+
+%.o: %.c Makefile
+	@#printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(CC) $(CFLAGS) -o $@ -c $<
+
+clean:
+	$(Q)rm -f *.o
+	$(Q)rm -f *.d
+	$(Q)rm -f *.elf
+	$(Q)rm -f *.bin
+	$(Q)rm -f *.hex
+	$(Q)rm -f *.srec
+	$(Q)rm -f *.list
+
+ifeq ($(OOCD_SERIAL),)
+%.flash: %.hex
+	@printf "  FLASH   $<\n"
+	@# IMPORTANT: Don't use "resume", only "reset" will work correctly!
+	$(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \
+		    -f board/$(OOCD_BOARD).cfg \
+		    -c "init" -c "reset init" \
+		    -c "stm32x mass_erase 0" \
+		    -c "flash write_image $(*).hex" \
+		    -c "reset" \
+		    -c "shutdown" $(NULL)
+else
+%.flash: %.hex
+	@printf "  FLASH   $<\n"
+	@# IMPORTANT: Don't use "resume", only "reset" will work correctly!
+	$(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \
+		    -f board/$(OOCD_BOARD).cfg \
+		    -c "ft2232_serial $(OOCD_SERIAL)" \
+		    -c "init" -c "reset init" \
+		    -c "stm32x mass_erase 0" \
+		    -c "flash write_image $(*).hex" \
+		    -c "reset" \
+		    -c "shutdown" $(NULL)
+endif
+
+.PHONY: images clean
+
+-include $(OBJS:.o=.d)
+
diff --git a/examples/stm32/lisa-m/fancyblink/Makefile b/examples/stm32f1/lisa-m/fancyblink/Makefile
similarity index 100%
rename from examples/stm32/lisa-m/fancyblink/Makefile
rename to examples/stm32f1/lisa-m/fancyblink/Makefile
diff --git a/examples/stm32/lisa-m/fancyblink/fancyblink.c b/examples/stm32f1/lisa-m/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32/lisa-m/fancyblink/fancyblink.c
rename to examples/stm32f1/lisa-m/fancyblink/fancyblink.c
diff --git a/examples/stm32/lisa-m/fancyblink/fancyblink.ld b/examples/stm32f1/lisa-m/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32/lisa-m/fancyblink/fancyblink.ld
rename to examples/stm32f1/lisa-m/fancyblink/fancyblink.ld
diff --git a/examples/stm32/lisa-m/usb_dfu/Makefile b/examples/stm32f1/lisa-m/usb_dfu/Makefile
similarity index 100%
rename from examples/stm32/lisa-m/usb_dfu/Makefile
rename to examples/stm32f1/lisa-m/usb_dfu/Makefile
diff --git a/examples/stm32/lisa-m/usb_dfu/README b/examples/stm32f1/lisa-m/usb_dfu/README
similarity index 100%
rename from examples/stm32/lisa-m/usb_dfu/README
rename to examples/stm32f1/lisa-m/usb_dfu/README
diff --git a/examples/stm32/lisa-m/usb_dfu/usbdfu.c b/examples/stm32f1/lisa-m/usb_dfu/usbdfu.c
similarity index 100%
rename from examples/stm32/lisa-m/usb_dfu/usbdfu.c
rename to examples/stm32f1/lisa-m/usb_dfu/usbdfu.c
diff --git a/examples/stm32/lisa-m/usb_dfu/usbdfu.ld b/examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld
similarity index 100%
rename from examples/stm32/lisa-m/usb_dfu/usbdfu.ld
rename to examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld
diff --git a/examples/stm32/lisa-m/usb_hid/Makefile b/examples/stm32f1/lisa-m/usb_hid/Makefile
similarity index 100%
rename from examples/stm32/lisa-m/usb_hid/Makefile
rename to examples/stm32f1/lisa-m/usb_hid/Makefile
diff --git a/examples/stm32/lisa-m/usb_hid/README b/examples/stm32f1/lisa-m/usb_hid/README
similarity index 100%
rename from examples/stm32/lisa-m/usb_hid/README
rename to examples/stm32f1/lisa-m/usb_hid/README
diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.c b/examples/stm32f1/lisa-m/usb_hid/usbhid.c
similarity index 100%
rename from examples/stm32/lisa-m/usb_hid/usbhid.c
rename to examples/stm32f1/lisa-m/usb_hid/usbhid.c
diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.ld b/examples/stm32f1/lisa-m/usb_hid/usbhid.ld
similarity index 100%
rename from examples/stm32/lisa-m/usb_hid/usbhid.ld
rename to examples/stm32f1/lisa-m/usb_hid/usbhid.ld
diff --git a/examples/stm32/mb525/fancyblink/Makefile b/examples/stm32f1/mb525/fancyblink/Makefile
similarity index 100%
rename from examples/stm32/mb525/fancyblink/Makefile
rename to examples/stm32f1/mb525/fancyblink/Makefile
diff --git a/examples/stm32/mb525/fancyblink/README b/examples/stm32f1/mb525/fancyblink/README
similarity index 100%
rename from examples/stm32/mb525/fancyblink/README
rename to examples/stm32f1/mb525/fancyblink/README
diff --git a/examples/stm32/mb525/fancyblink/fancyblink.c b/examples/stm32f1/mb525/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32/mb525/fancyblink/fancyblink.c
rename to examples/stm32f1/mb525/fancyblink/fancyblink.c
diff --git a/examples/stm32/mb525/fancyblink/fancyblink.ld b/examples/stm32f1/mb525/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32/mb525/fancyblink/fancyblink.ld
rename to examples/stm32f1/mb525/fancyblink/fancyblink.ld
diff --git a/examples/stm32/mb525/pwmleds/Makefile b/examples/stm32f1/mb525/pwmleds/Makefile
similarity index 100%
rename from examples/stm32/mb525/pwmleds/Makefile
rename to examples/stm32f1/mb525/pwmleds/Makefile
diff --git a/examples/stm32/mb525/pwmleds/README b/examples/stm32f1/mb525/pwmleds/README
similarity index 100%
rename from examples/stm32/mb525/pwmleds/README
rename to examples/stm32f1/mb525/pwmleds/README
diff --git a/examples/stm32/mb525/pwmleds/pwmleds.c b/examples/stm32f1/mb525/pwmleds/pwmleds.c
similarity index 100%
rename from examples/stm32/mb525/pwmleds/pwmleds.c
rename to examples/stm32f1/mb525/pwmleds/pwmleds.c
diff --git a/examples/stm32/mb525/pwmleds/pwmleds.ld b/examples/stm32f1/mb525/pwmleds/pwmleds.ld
similarity index 100%
rename from examples/stm32/mb525/pwmleds/pwmleds.ld
rename to examples/stm32f1/mb525/pwmleds/pwmleds.ld
diff --git a/examples/stm32/obldc/can/Makefile b/examples/stm32f1/obldc/can/Makefile
similarity index 100%
rename from examples/stm32/obldc/can/Makefile
rename to examples/stm32f1/obldc/can/Makefile
diff --git a/examples/stm32/obldc/can/can.c b/examples/stm32f1/obldc/can/can.c
similarity index 100%
rename from examples/stm32/obldc/can/can.c
rename to examples/stm32f1/obldc/can/can.c
diff --git a/examples/stm32/obldc/can/can.ld b/examples/stm32f1/obldc/can/can.ld
similarity index 100%
rename from examples/stm32/obldc/can/can.ld
rename to examples/stm32f1/obldc/can/can.ld
diff --git a/examples/stm32/obldc/led/Makefile b/examples/stm32f1/obldc/led/Makefile
similarity index 100%
rename from examples/stm32/obldc/led/Makefile
rename to examples/stm32f1/obldc/led/Makefile
diff --git a/examples/stm32/obldc/led/led.c b/examples/stm32f1/obldc/led/led.c
similarity index 100%
rename from examples/stm32/obldc/led/led.c
rename to examples/stm32f1/obldc/led/led.c
diff --git a/examples/stm32/obldc/led/led.ld b/examples/stm32f1/obldc/led/led.ld
similarity index 100%
rename from examples/stm32/obldc/led/led.ld
rename to examples/stm32f1/obldc/led/led.ld
diff --git a/examples/stm32/obldc/pwmleds/Makefile b/examples/stm32f1/obldc/pwmleds/Makefile
similarity index 100%
rename from examples/stm32/obldc/pwmleds/Makefile
rename to examples/stm32f1/obldc/pwmleds/Makefile
diff --git a/examples/stm32/obldc/pwmleds/pwmleds.c b/examples/stm32f1/obldc/pwmleds/pwmleds.c
similarity index 100%
rename from examples/stm32/obldc/pwmleds/pwmleds.c
rename to examples/stm32f1/obldc/pwmleds/pwmleds.c
diff --git a/examples/stm32/obldc/pwmleds/pwmleds.ld b/examples/stm32f1/obldc/pwmleds/pwmleds.ld
similarity index 100%
rename from examples/stm32/obldc/pwmleds/pwmleds.ld
rename to examples/stm32f1/obldc/pwmleds/pwmleds.ld
diff --git a/examples/stm32/obldc/systick/Makefile b/examples/stm32f1/obldc/systick/Makefile
similarity index 100%
rename from examples/stm32/obldc/systick/Makefile
rename to examples/stm32f1/obldc/systick/Makefile
diff --git a/examples/stm32/obldc/systick/systick.c b/examples/stm32f1/obldc/systick/systick.c
similarity index 100%
rename from examples/stm32/obldc/systick/systick.c
rename to examples/stm32f1/obldc/systick/systick.c
diff --git a/examples/stm32/obldc/systick/systick.ld b/examples/stm32f1/obldc/systick/systick.ld
similarity index 100%
rename from examples/stm32/obldc/systick/systick.ld
rename to examples/stm32f1/obldc/systick/systick.ld
diff --git a/examples/stm32/obldc/usart/Makefile b/examples/stm32f1/obldc/usart/Makefile
similarity index 100%
rename from examples/stm32/obldc/usart/Makefile
rename to examples/stm32f1/obldc/usart/Makefile
diff --git a/examples/stm32/obldc/usart/usart.c b/examples/stm32f1/obldc/usart/usart.c
similarity index 100%
rename from examples/stm32/obldc/usart/usart.c
rename to examples/stm32f1/obldc/usart/usart.c
diff --git a/examples/stm32/obldc/usart/usart.ld b/examples/stm32f1/obldc/usart/usart.ld
similarity index 100%
rename from examples/stm32/obldc/usart/usart.ld
rename to examples/stm32f1/obldc/usart/usart.ld
diff --git a/examples/stm32/obldc/usart_irq/Makefile b/examples/stm32f1/obldc/usart_irq/Makefile
similarity index 100%
rename from examples/stm32/obldc/usart_irq/Makefile
rename to examples/stm32f1/obldc/usart_irq/Makefile
diff --git a/examples/stm32/obldc/usart_irq/usart_irq.c b/examples/stm32f1/obldc/usart_irq/usart_irq.c
similarity index 100%
rename from examples/stm32/obldc/usart_irq/usart_irq.c
rename to examples/stm32f1/obldc/usart_irq/usart_irq.c
diff --git a/examples/stm32/obldc/usart_irq/usart_irq.ld b/examples/stm32f1/obldc/usart_irq/usart_irq.ld
similarity index 100%
rename from examples/stm32/obldc/usart_irq/usart_irq.ld
rename to examples/stm32f1/obldc/usart_irq/usart_irq.ld
diff --git a/examples/stm32/other/adc_temperature_sensor/Makefile b/examples/stm32f1/other/adc_temperature_sensor/Makefile
similarity index 100%
rename from examples/stm32/other/adc_temperature_sensor/Makefile
rename to examples/stm32f1/other/adc_temperature_sensor/Makefile
diff --git a/examples/stm32/other/adc_temperature_sensor/README b/examples/stm32f1/other/adc_temperature_sensor/README
similarity index 100%
rename from examples/stm32/other/adc_temperature_sensor/README
rename to examples/stm32f1/other/adc_temperature_sensor/README
diff --git a/examples/stm32/other/adc_temperature_sensor/adc.c b/examples/stm32f1/other/adc_temperature_sensor/adc.c
similarity index 100%
rename from examples/stm32/other/adc_temperature_sensor/adc.c
rename to examples/stm32f1/other/adc_temperature_sensor/adc.c
diff --git a/examples/stm32/other/adc_temperature_sensor/adc.ld b/examples/stm32f1/other/adc_temperature_sensor/adc.ld
similarity index 100%
rename from examples/stm32/other/adc_temperature_sensor/adc.ld
rename to examples/stm32f1/other/adc_temperature_sensor/adc.ld
diff --git a/examples/stm32/other/dma_mem2mem/Makefile b/examples/stm32f1/other/dma_mem2mem/Makefile
similarity index 100%
rename from examples/stm32/other/dma_mem2mem/Makefile
rename to examples/stm32f1/other/dma_mem2mem/Makefile
diff --git a/examples/stm32/other/dma_mem2mem/README b/examples/stm32f1/other/dma_mem2mem/README
similarity index 100%
rename from examples/stm32/other/dma_mem2mem/README
rename to examples/stm32f1/other/dma_mem2mem/README
diff --git a/examples/stm32/other/dma_mem2mem/dma.c b/examples/stm32f1/other/dma_mem2mem/dma.c
similarity index 100%
rename from examples/stm32/other/dma_mem2mem/dma.c
rename to examples/stm32f1/other/dma_mem2mem/dma.c
diff --git a/examples/stm32/other/dma_mem2mem/dma.ld b/examples/stm32f1/other/dma_mem2mem/dma.ld
similarity index 100%
rename from examples/stm32/other/dma_mem2mem/dma.ld
rename to examples/stm32f1/other/dma_mem2mem/dma.ld
diff --git a/examples/stm32/other/dogm128/Makefile b/examples/stm32f1/other/dogm128/Makefile
similarity index 100%
rename from examples/stm32/other/dogm128/Makefile
rename to examples/stm32f1/other/dogm128/Makefile
diff --git a/examples/stm32/other/dogm128/README b/examples/stm32f1/other/dogm128/README
similarity index 100%
rename from examples/stm32/other/dogm128/README
rename to examples/stm32f1/other/dogm128/README
diff --git a/examples/stm32/other/dogm128/dogm128.c b/examples/stm32f1/other/dogm128/dogm128.c
similarity index 100%
rename from examples/stm32/other/dogm128/dogm128.c
rename to examples/stm32f1/other/dogm128/dogm128.c
diff --git a/examples/stm32/other/dogm128/dogm128.h b/examples/stm32f1/other/dogm128/dogm128.h
similarity index 100%
rename from examples/stm32/other/dogm128/dogm128.h
rename to examples/stm32f1/other/dogm128/dogm128.h
diff --git a/examples/stm32/other/dogm128/main.c b/examples/stm32f1/other/dogm128/main.c
similarity index 100%
rename from examples/stm32/other/dogm128/main.c
rename to examples/stm32f1/other/dogm128/main.c
diff --git a/examples/stm32/other/dogm128/main.ld b/examples/stm32f1/other/dogm128/main.ld
similarity index 100%
rename from examples/stm32/other/dogm128/main.ld
rename to examples/stm32f1/other/dogm128/main.ld
diff --git a/examples/stm32/other/i2c_stts75_sensor/Makefile b/examples/stm32f1/other/i2c_stts75_sensor/Makefile
similarity index 100%
rename from examples/stm32/other/i2c_stts75_sensor/Makefile
rename to examples/stm32f1/other/i2c_stts75_sensor/Makefile
diff --git a/examples/stm32/other/i2c_stts75_sensor/README b/examples/stm32f1/other/i2c_stts75_sensor/README
similarity index 100%
rename from examples/stm32/other/i2c_stts75_sensor/README
rename to examples/stm32f1/other/i2c_stts75_sensor/README
diff --git a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c b/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
similarity index 100%
rename from examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c
rename to examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
diff --git a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld b/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
similarity index 100%
rename from examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
rename to examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
diff --git a/examples/stm32/other/i2c_stts75_sensor/stts75.c b/examples/stm32f1/other/i2c_stts75_sensor/stts75.c
similarity index 100%
rename from examples/stm32/other/i2c_stts75_sensor/stts75.c
rename to examples/stm32f1/other/i2c_stts75_sensor/stts75.c
diff --git a/examples/stm32/other/i2c_stts75_sensor/stts75.h b/examples/stm32f1/other/i2c_stts75_sensor/stts75.h
similarity index 100%
rename from examples/stm32/other/i2c_stts75_sensor/stts75.h
rename to examples/stm32f1/other/i2c_stts75_sensor/stts75.h
diff --git a/examples/stm32/other/rtc/Makefile b/examples/stm32f1/other/rtc/Makefile
similarity index 100%
rename from examples/stm32/other/rtc/Makefile
rename to examples/stm32f1/other/rtc/Makefile
diff --git a/examples/stm32/other/rtc/README b/examples/stm32f1/other/rtc/README
similarity index 100%
rename from examples/stm32/other/rtc/README
rename to examples/stm32f1/other/rtc/README
diff --git a/examples/stm32/other/rtc/rtc.c b/examples/stm32f1/other/rtc/rtc.c
similarity index 100%
rename from examples/stm32/other/rtc/rtc.c
rename to examples/stm32f1/other/rtc/rtc.c
diff --git a/examples/stm32/other/rtc/rtc.ld b/examples/stm32f1/other/rtc/rtc.ld
similarity index 100%
rename from examples/stm32/other/rtc/rtc.ld
rename to examples/stm32f1/other/rtc/rtc.ld
diff --git a/examples/stm32/other/systick/Makefile b/examples/stm32f1/other/systick/Makefile
similarity index 100%
rename from examples/stm32/other/systick/Makefile
rename to examples/stm32f1/other/systick/Makefile
diff --git a/examples/stm32/other/systick/README b/examples/stm32f1/other/systick/README
similarity index 100%
rename from examples/stm32/other/systick/README
rename to examples/stm32f1/other/systick/README
diff --git a/examples/stm32/other/systick/systick.c b/examples/stm32f1/other/systick/systick.c
similarity index 100%
rename from examples/stm32/other/systick/systick.c
rename to examples/stm32f1/other/systick/systick.c
diff --git a/examples/stm32/other/systick/systick.ld b/examples/stm32f1/other/systick/systick.ld
similarity index 100%
rename from examples/stm32/other/systick/systick.ld
rename to examples/stm32f1/other/systick/systick.ld
diff --git a/examples/stm32/other/timer_interrupt/Makefile b/examples/stm32f1/other/timer_interrupt/Makefile
similarity index 100%
rename from examples/stm32/other/timer_interrupt/Makefile
rename to examples/stm32f1/other/timer_interrupt/Makefile
diff --git a/examples/stm32/other/timer_interrupt/README b/examples/stm32f1/other/timer_interrupt/README
similarity index 100%
rename from examples/stm32/other/timer_interrupt/README
rename to examples/stm32f1/other/timer_interrupt/README
diff --git a/examples/stm32/other/timer_interrupt/timer.c b/examples/stm32f1/other/timer_interrupt/timer.c
similarity index 100%
rename from examples/stm32/other/timer_interrupt/timer.c
rename to examples/stm32f1/other/timer_interrupt/timer.c
diff --git a/examples/stm32/other/timer_interrupt/timer.ld b/examples/stm32f1/other/timer_interrupt/timer.ld
similarity index 100%
rename from examples/stm32/other/timer_interrupt/timer.ld
rename to examples/stm32f1/other/timer_interrupt/timer.ld
diff --git a/examples/stm32/other/usb_cdcacm/Makefile b/examples/stm32f1/other/usb_cdcacm/Makefile
similarity index 100%
rename from examples/stm32/other/usb_cdcacm/Makefile
rename to examples/stm32f1/other/usb_cdcacm/Makefile
diff --git a/examples/stm32/other/usb_cdcacm/README b/examples/stm32f1/other/usb_cdcacm/README
similarity index 100%
rename from examples/stm32/other/usb_cdcacm/README
rename to examples/stm32f1/other/usb_cdcacm/README
diff --git a/examples/stm32/other/usb_cdcacm/cdcacm.c b/examples/stm32f1/other/usb_cdcacm/cdcacm.c
similarity index 100%
rename from examples/stm32/other/usb_cdcacm/cdcacm.c
rename to examples/stm32f1/other/usb_cdcacm/cdcacm.c
diff --git a/examples/stm32/other/usb_cdcacm/cdcacm.ld b/examples/stm32f1/other/usb_cdcacm/cdcacm.ld
similarity index 100%
rename from examples/stm32/other/usb_cdcacm/cdcacm.ld
rename to examples/stm32f1/other/usb_cdcacm/cdcacm.ld
diff --git a/examples/stm32/other/usb_dfu/Makefile b/examples/stm32f1/other/usb_dfu/Makefile
similarity index 100%
rename from examples/stm32/other/usb_dfu/Makefile
rename to examples/stm32f1/other/usb_dfu/Makefile
diff --git a/examples/stm32/other/usb_dfu/README b/examples/stm32f1/other/usb_dfu/README
similarity index 100%
rename from examples/stm32/other/usb_dfu/README
rename to examples/stm32f1/other/usb_dfu/README
diff --git a/examples/stm32/other/usb_dfu/usbdfu.c b/examples/stm32f1/other/usb_dfu/usbdfu.c
similarity index 100%
rename from examples/stm32/other/usb_dfu/usbdfu.c
rename to examples/stm32f1/other/usb_dfu/usbdfu.c
diff --git a/examples/stm32/other/usb_dfu/usbdfu.ld b/examples/stm32f1/other/usb_dfu/usbdfu.ld
similarity index 100%
rename from examples/stm32/other/usb_dfu/usbdfu.ld
rename to examples/stm32f1/other/usb_dfu/usbdfu.ld
diff --git a/examples/stm32/other/usb_hid/Makefile b/examples/stm32f1/other/usb_hid/Makefile
similarity index 100%
rename from examples/stm32/other/usb_hid/Makefile
rename to examples/stm32f1/other/usb_hid/Makefile
diff --git a/examples/stm32/other/usb_hid/README b/examples/stm32f1/other/usb_hid/README
similarity index 100%
rename from examples/stm32/other/usb_hid/README
rename to examples/stm32f1/other/usb_hid/README
diff --git a/examples/stm32/other/usb_hid/usbhid.c b/examples/stm32f1/other/usb_hid/usbhid.c
similarity index 100%
rename from examples/stm32/other/usb_hid/usbhid.c
rename to examples/stm32f1/other/usb_hid/usbhid.c
diff --git a/examples/stm32/other/usb_hid/usbhid.ld b/examples/stm32f1/other/usb_hid/usbhid.ld
similarity index 100%
rename from examples/stm32/other/usb_hid/usbhid.ld
rename to examples/stm32f1/other/usb_hid/usbhid.ld
diff --git a/examples/stm32/stm32-discovery/button/Makefile b/examples/stm32f1/stm32-discovery/button/Makefile
similarity index 100%
rename from examples/stm32/stm32-discovery/button/Makefile
rename to examples/stm32f1/stm32-discovery/button/Makefile
diff --git a/examples/stm32/stm32-discovery/button/README b/examples/stm32f1/stm32-discovery/button/README
similarity index 100%
rename from examples/stm32/stm32-discovery/button/README
rename to examples/stm32f1/stm32-discovery/button/README
diff --git a/examples/stm32/stm32-discovery/button/button.c b/examples/stm32f1/stm32-discovery/button/button.c
similarity index 100%
rename from examples/stm32/stm32-discovery/button/button.c
rename to examples/stm32f1/stm32-discovery/button/button.c
diff --git a/examples/stm32/stm32-discovery/button/button.ld b/examples/stm32f1/stm32-discovery/button/button.ld
similarity index 100%
rename from examples/stm32/stm32-discovery/button/button.ld
rename to examples/stm32f1/stm32-discovery/button/button.ld
diff --git a/examples/stm32/stm32-discovery/fancyblink/Makefile b/examples/stm32f1/stm32-discovery/fancyblink/Makefile
similarity index 100%
rename from examples/stm32/stm32-discovery/fancyblink/Makefile
rename to examples/stm32f1/stm32-discovery/fancyblink/Makefile
diff --git a/examples/stm32/stm32-discovery/fancyblink/README b/examples/stm32f1/stm32-discovery/fancyblink/README
similarity index 100%
rename from examples/stm32/stm32-discovery/fancyblink/README
rename to examples/stm32f1/stm32-discovery/fancyblink/README
diff --git a/examples/stm32/stm32-discovery/fancyblink/fancyblink.c b/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32/stm32-discovery/fancyblink/fancyblink.c
rename to examples/stm32f1/stm32-discovery/fancyblink/fancyblink.c
diff --git a/examples/stm32/stm32-discovery/fancyblink/fancyblink.ld b/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32/stm32-discovery/fancyblink/fancyblink.ld
rename to examples/stm32f1/stm32-discovery/fancyblink/fancyblink.ld
diff --git a/examples/stm32/stm32-discovery/miniblink/Makefile b/examples/stm32f1/stm32-discovery/miniblink/Makefile
similarity index 100%
rename from examples/stm32/stm32-discovery/miniblink/Makefile
rename to examples/stm32f1/stm32-discovery/miniblink/Makefile
diff --git a/examples/stm32/stm32-discovery/miniblink/README b/examples/stm32f1/stm32-discovery/miniblink/README
similarity index 100%
rename from examples/stm32/stm32-discovery/miniblink/README
rename to examples/stm32f1/stm32-discovery/miniblink/README
diff --git a/examples/stm32/stm32-discovery/miniblink/miniblink.c b/examples/stm32f1/stm32-discovery/miniblink/miniblink.c
similarity index 100%
rename from examples/stm32/stm32-discovery/miniblink/miniblink.c
rename to examples/stm32f1/stm32-discovery/miniblink/miniblink.c
diff --git a/examples/stm32/stm32-discovery/miniblink/miniblink.ld b/examples/stm32f1/stm32-discovery/miniblink/miniblink.ld
similarity index 100%
rename from examples/stm32/stm32-discovery/miniblink/miniblink.ld
rename to examples/stm32f1/stm32-discovery/miniblink/miniblink.ld
diff --git a/examples/stm32/stm32-discovery/rtc/Makefile b/examples/stm32f1/stm32-discovery/rtc/Makefile
similarity index 100%
rename from examples/stm32/stm32-discovery/rtc/Makefile
rename to examples/stm32f1/stm32-discovery/rtc/Makefile
diff --git a/examples/stm32/stm32-discovery/rtc/README b/examples/stm32f1/stm32-discovery/rtc/README
similarity index 100%
rename from examples/stm32/stm32-discovery/rtc/README
rename to examples/stm32f1/stm32-discovery/rtc/README
diff --git a/examples/stm32/stm32-discovery/rtc/rtc.c b/examples/stm32f1/stm32-discovery/rtc/rtc.c
similarity index 100%
rename from examples/stm32/stm32-discovery/rtc/rtc.c
rename to examples/stm32f1/stm32-discovery/rtc/rtc.c
diff --git a/examples/stm32/stm32-discovery/rtc/rtc.ld b/examples/stm32f1/stm32-discovery/rtc/rtc.ld
similarity index 100%
rename from examples/stm32/stm32-discovery/rtc/rtc.ld
rename to examples/stm32f1/stm32-discovery/rtc/rtc.ld
diff --git a/examples/stm32/stm32-discovery/usart/Makefile b/examples/stm32f1/stm32-discovery/usart/Makefile
similarity index 100%
rename from examples/stm32/stm32-discovery/usart/Makefile
rename to examples/stm32f1/stm32-discovery/usart/Makefile
diff --git a/examples/stm32/stm32-discovery/usart/README b/examples/stm32f1/stm32-discovery/usart/README
similarity index 100%
rename from examples/stm32/stm32-discovery/usart/README
rename to examples/stm32f1/stm32-discovery/usart/README
diff --git a/examples/stm32/stm32-discovery/usart/usart.c b/examples/stm32f1/stm32-discovery/usart/usart.c
similarity index 100%
rename from examples/stm32/stm32-discovery/usart/usart.c
rename to examples/stm32f1/stm32-discovery/usart/usart.c
diff --git a/examples/stm32/stm32-discovery/usart/usart.ld b/examples/stm32f1/stm32-discovery/usart/usart.ld
similarity index 100%
rename from examples/stm32/stm32-discovery/usart/usart.ld
rename to examples/stm32f1/stm32-discovery/usart/usart.ld
diff --git a/examples/stm32/stm32-h103/button/Makefile b/examples/stm32f1/stm32-h103/button/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/button/Makefile
rename to examples/stm32f1/stm32-h103/button/Makefile
diff --git a/examples/stm32/stm32-h103/button/button.c b/examples/stm32f1/stm32-h103/button/button.c
similarity index 100%
rename from examples/stm32/stm32-h103/button/button.c
rename to examples/stm32f1/stm32-h103/button/button.c
diff --git a/examples/stm32/stm32-h103/button/button.ld b/examples/stm32f1/stm32-h103/button/button.ld
similarity index 100%
rename from examples/stm32/stm32-h103/button/button.ld
rename to examples/stm32f1/stm32-h103/button/button.ld
diff --git a/examples/stm32/stm32-h103/exti_both/Makefile b/examples/stm32f1/stm32-h103/exti_both/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/exti_both/Makefile
rename to examples/stm32f1/stm32-h103/exti_both/Makefile
diff --git a/examples/stm32/stm32-h103/exti_both/exti_both.c b/examples/stm32f1/stm32-h103/exti_both/exti_both.c
similarity index 100%
rename from examples/stm32/stm32-h103/exti_both/exti_both.c
rename to examples/stm32f1/stm32-h103/exti_both/exti_both.c
diff --git a/examples/stm32/stm32-h103/exti_both/exti_both.ld b/examples/stm32f1/stm32-h103/exti_both/exti_both.ld
similarity index 100%
rename from examples/stm32/stm32-h103/exti_both/exti_both.ld
rename to examples/stm32f1/stm32-h103/exti_both/exti_both.ld
diff --git a/examples/stm32/stm32-h103/exti_rising_falling/Makefile b/examples/stm32f1/stm32-h103/exti_rising_falling/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/exti_rising_falling/Makefile
rename to examples/stm32f1/stm32-h103/exti_rising_falling/Makefile
diff --git a/examples/stm32/stm32-h103/exti_rising_falling/exti_rising_falling.c b/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
similarity index 100%
rename from examples/stm32/stm32-h103/exti_rising_falling/exti_rising_falling.c
rename to examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
diff --git a/examples/stm32/stm32-h103/exti_rising_falling/exti_rising_falling.ld b/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
similarity index 100%
rename from examples/stm32/stm32-h103/exti_rising_falling/exti_rising_falling.ld
rename to examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
diff --git a/examples/stm32/stm32-h103/fancyblink/Makefile b/examples/stm32f1/stm32-h103/fancyblink/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/fancyblink/Makefile
rename to examples/stm32f1/stm32-h103/fancyblink/Makefile
diff --git a/examples/stm32/stm32-h103/fancyblink/README b/examples/stm32f1/stm32-h103/fancyblink/README
similarity index 100%
rename from examples/stm32/stm32-h103/fancyblink/README
rename to examples/stm32f1/stm32-h103/fancyblink/README
diff --git a/examples/stm32/stm32-h103/fancyblink/fancyblink.c b/examples/stm32f1/stm32-h103/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32/stm32-h103/fancyblink/fancyblink.c
rename to examples/stm32f1/stm32-h103/fancyblink/fancyblink.c
diff --git a/examples/stm32/stm32-h103/fancyblink/fancyblink.ld b/examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32/stm32-h103/fancyblink/fancyblink.ld
rename to examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
diff --git a/examples/stm32/stm32-h103/led_stripe/Makefile b/examples/stm32f1/stm32-h103/led_stripe/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/led_stripe/Makefile
rename to examples/stm32f1/stm32-h103/led_stripe/Makefile
diff --git a/examples/stm32/stm32-h103/led_stripe/led_stripe.c b/examples/stm32f1/stm32-h103/led_stripe/led_stripe.c
similarity index 100%
rename from examples/stm32/stm32-h103/led_stripe/led_stripe.c
rename to examples/stm32f1/stm32-h103/led_stripe/led_stripe.c
diff --git a/examples/stm32/stm32-h103/led_stripe/led_stripe.ld b/examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld
similarity index 100%
rename from examples/stm32/stm32-h103/led_stripe/led_stripe.ld
rename to examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld
diff --git a/examples/stm32/stm32-h103/miniblink/Makefile b/examples/stm32f1/stm32-h103/miniblink/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/miniblink/Makefile
rename to examples/stm32f1/stm32-h103/miniblink/Makefile
diff --git a/examples/stm32/stm32-h103/miniblink/README b/examples/stm32f1/stm32-h103/miniblink/README
similarity index 100%
rename from examples/stm32/stm32-h103/miniblink/README
rename to examples/stm32f1/stm32-h103/miniblink/README
diff --git a/examples/stm32/stm32-h103/miniblink/miniblink.c b/examples/stm32f1/stm32-h103/miniblink/miniblink.c
similarity index 100%
rename from examples/stm32/stm32-h103/miniblink/miniblink.c
rename to examples/stm32f1/stm32-h103/miniblink/miniblink.c
diff --git a/examples/stm32/stm32-h103/miniblink/miniblink.ld b/examples/stm32f1/stm32-h103/miniblink/miniblink.ld
similarity index 100%
rename from examples/stm32/stm32-h103/miniblink/miniblink.ld
rename to examples/stm32f1/stm32-h103/miniblink/miniblink.ld
diff --git a/examples/stm32/stm32-h103/pwm_6step/Makefile b/examples/stm32f1/stm32-h103/pwm_6step/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/pwm_6step/Makefile
rename to examples/stm32f1/stm32-h103/pwm_6step/Makefile
diff --git a/examples/stm32/stm32-h103/pwm_6step/pwm_6step.c b/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c
similarity index 100%
rename from examples/stm32/stm32-h103/pwm_6step/pwm_6step.c
rename to examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c
diff --git a/examples/stm32/stm32-h103/pwm_6step/pwm_6step.ld b/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld
similarity index 100%
rename from examples/stm32/stm32-h103/pwm_6step/pwm_6step.ld
rename to examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld
diff --git a/examples/stm32/stm32-h103/spi/Makefile b/examples/stm32f1/stm32-h103/spi/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/spi/Makefile
rename to examples/stm32f1/stm32-h103/spi/Makefile
diff --git a/examples/stm32/stm32-h103/spi/README b/examples/stm32f1/stm32-h103/spi/README
similarity index 100%
rename from examples/stm32/stm32-h103/spi/README
rename to examples/stm32f1/stm32-h103/spi/README
diff --git a/examples/stm32/stm32-h103/spi/spi.c b/examples/stm32f1/stm32-h103/spi/spi.c
similarity index 100%
rename from examples/stm32/stm32-h103/spi/spi.c
rename to examples/stm32f1/stm32-h103/spi/spi.c
diff --git a/examples/stm32/stm32-h103/spi/spi.ld b/examples/stm32f1/stm32-h103/spi/spi.ld
similarity index 100%
rename from examples/stm32/stm32-h103/spi/spi.ld
rename to examples/stm32f1/stm32-h103/spi/spi.ld
diff --git a/examples/stm32/stm32-h103/timer/Makefile b/examples/stm32f1/stm32-h103/timer/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/timer/Makefile
rename to examples/stm32f1/stm32-h103/timer/Makefile
diff --git a/examples/stm32/stm32-h103/timer/timer.c b/examples/stm32f1/stm32-h103/timer/timer.c
similarity index 100%
rename from examples/stm32/stm32-h103/timer/timer.c
rename to examples/stm32f1/stm32-h103/timer/timer.c
diff --git a/examples/stm32/stm32-h103/timer/timer.ld b/examples/stm32f1/stm32-h103/timer/timer.ld
similarity index 100%
rename from examples/stm32/stm32-h103/timer/timer.ld
rename to examples/stm32f1/stm32-h103/timer/timer.ld
diff --git a/examples/stm32/stm32-h103/traceswo/Makefile b/examples/stm32f1/stm32-h103/traceswo/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/traceswo/Makefile
rename to examples/stm32f1/stm32-h103/traceswo/Makefile
diff --git a/examples/stm32/stm32-h103/traceswo/README b/examples/stm32f1/stm32-h103/traceswo/README
similarity index 100%
rename from examples/stm32/stm32-h103/traceswo/README
rename to examples/stm32f1/stm32-h103/traceswo/README
diff --git a/examples/stm32/stm32-h103/traceswo/traceswo.c b/examples/stm32f1/stm32-h103/traceswo/traceswo.c
similarity index 100%
rename from examples/stm32/stm32-h103/traceswo/traceswo.c
rename to examples/stm32f1/stm32-h103/traceswo/traceswo.c
diff --git a/examples/stm32/stm32-h103/traceswo/traceswo.ld b/examples/stm32f1/stm32-h103/traceswo/traceswo.ld
similarity index 100%
rename from examples/stm32/stm32-h103/traceswo/traceswo.ld
rename to examples/stm32f1/stm32-h103/traceswo/traceswo.ld
diff --git a/examples/stm32/stm32-h103/usart/Makefile b/examples/stm32f1/stm32-h103/usart/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/usart/Makefile
rename to examples/stm32f1/stm32-h103/usart/Makefile
diff --git a/examples/stm32/stm32-h103/usart/README b/examples/stm32f1/stm32-h103/usart/README
similarity index 100%
rename from examples/stm32/stm32-h103/usart/README
rename to examples/stm32f1/stm32-h103/usart/README
diff --git a/examples/stm32/stm32-h103/usart/usart.c b/examples/stm32f1/stm32-h103/usart/usart.c
similarity index 100%
rename from examples/stm32/stm32-h103/usart/usart.c
rename to examples/stm32f1/stm32-h103/usart/usart.c
diff --git a/examples/stm32/stm32-h103/usart/usart.ld b/examples/stm32f1/stm32-h103/usart/usart.ld
similarity index 100%
rename from examples/stm32/stm32-h103/usart/usart.ld
rename to examples/stm32f1/stm32-h103/usart/usart.ld
diff --git a/examples/stm32/stm32-h103/usart_irq/Makefile b/examples/stm32f1/stm32-h103/usart_irq/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/usart_irq/Makefile
rename to examples/stm32f1/stm32-h103/usart_irq/Makefile
diff --git a/examples/stm32/stm32-h103/usart_irq/usart_irq.c b/examples/stm32f1/stm32-h103/usart_irq/usart_irq.c
similarity index 100%
rename from examples/stm32/stm32-h103/usart_irq/usart_irq.c
rename to examples/stm32f1/stm32-h103/usart_irq/usart_irq.c
diff --git a/examples/stm32/stm32-h103/usart_irq/usart_irq.ld b/examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
similarity index 100%
rename from examples/stm32/stm32-h103/usart_irq/usart_irq.ld
rename to examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
diff --git a/examples/stm32/stm32-h103/usart_irq_printf/Makefile b/examples/stm32f1/stm32-h103/usart_irq_printf/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/usart_irq_printf/Makefile
rename to examples/stm32f1/stm32-h103/usart_irq_printf/Makefile
diff --git a/examples/stm32/stm32-h103/usart_irq_printf/usart_irq_printf.c b/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
similarity index 100%
rename from examples/stm32/stm32-h103/usart_irq_printf/usart_irq_printf.c
rename to examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
diff --git a/examples/stm32/stm32-h103/usart_irq_printf/usart_irq_printf.ld b/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
similarity index 100%
rename from examples/stm32/stm32-h103/usart_irq_printf/usart_irq_printf.ld
rename to examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
diff --git a/examples/stm32/stm32-h103/usart_printf/Makefile b/examples/stm32f1/stm32-h103/usart_printf/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/usart_printf/Makefile
rename to examples/stm32f1/stm32-h103/usart_printf/Makefile
diff --git a/examples/stm32/stm32-h103/usart_printf/usart_printf.c b/examples/stm32f1/stm32-h103/usart_printf/usart_printf.c
similarity index 100%
rename from examples/stm32/stm32-h103/usart_printf/usart_printf.c
rename to examples/stm32f1/stm32-h103/usart_printf/usart_printf.c
diff --git a/examples/stm32/stm32-h103/usart_printf/usart_printf.ld b/examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld
similarity index 100%
rename from examples/stm32/stm32-h103/usart_printf/usart_printf.ld
rename to examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld
diff --git a/examples/stm32/stm32-h103/usb_cdcacm/Makefile b/examples/stm32f1/stm32-h103/usb_cdcacm/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/usb_cdcacm/Makefile
rename to examples/stm32f1/stm32-h103/usb_cdcacm/Makefile
diff --git a/examples/stm32/stm32-h103/usb_cdcacm/README b/examples/stm32f1/stm32-h103/usb_cdcacm/README
similarity index 100%
rename from examples/stm32/stm32-h103/usb_cdcacm/README
rename to examples/stm32f1/stm32-h103/usb_cdcacm/README
diff --git a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c
similarity index 100%
rename from examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c
rename to examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c
diff --git a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld b/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld
similarity index 100%
rename from examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
rename to examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld
diff --git a/examples/stm32/stm32-h103/usb_dfu/Makefile b/examples/stm32f1/stm32-h103/usb_dfu/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/usb_dfu/Makefile
rename to examples/stm32f1/stm32-h103/usb_dfu/Makefile
diff --git a/examples/stm32/stm32-h103/usb_dfu/README b/examples/stm32f1/stm32-h103/usb_dfu/README
similarity index 100%
rename from examples/stm32/stm32-h103/usb_dfu/README
rename to examples/stm32f1/stm32-h103/usb_dfu/README
diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
similarity index 100%
rename from examples/stm32/stm32-h103/usb_dfu/usbdfu.c
rename to examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld b/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld
similarity index 100%
rename from examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
rename to examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld
diff --git a/examples/stm32/stm32-h103/usb_hid/Makefile b/examples/stm32f1/stm32-h103/usb_hid/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/usb_hid/Makefile
rename to examples/stm32f1/stm32-h103/usb_hid/Makefile
diff --git a/examples/stm32/stm32-h103/usb_hid/README b/examples/stm32f1/stm32-h103/usb_hid/README
similarity index 100%
rename from examples/stm32/stm32-h103/usb_hid/README
rename to examples/stm32f1/stm32-h103/usb_hid/README
diff --git a/examples/stm32/stm32-h103/usb_hid/usbhid.c b/examples/stm32f1/stm32-h103/usb_hid/usbhid.c
similarity index 100%
rename from examples/stm32/stm32-h103/usb_hid/usbhid.c
rename to examples/stm32f1/stm32-h103/usb_hid/usbhid.c
diff --git a/examples/stm32/stm32-h103/usb_hid/usbhid.ld b/examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
similarity index 100%
rename from examples/stm32/stm32-h103/usb_hid/usbhid.ld
rename to examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
diff --git a/examples/stm32/stm32-h103/usb_iap/Makefile b/examples/stm32f1/stm32-h103/usb_iap/Makefile
similarity index 100%
rename from examples/stm32/stm32-h103/usb_iap/Makefile
rename to examples/stm32f1/stm32-h103/usb_iap/Makefile
diff --git a/examples/stm32/stm32-h103/usb_iap/README b/examples/stm32f1/stm32-h103/usb_iap/README
similarity index 100%
rename from examples/stm32/stm32-h103/usb_iap/README
rename to examples/stm32f1/stm32-h103/usb_iap/README
diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.c b/examples/stm32f1/stm32-h103/usb_iap/usbiap.c
similarity index 100%
rename from examples/stm32/stm32-h103/usb_iap/usbiap.c
rename to examples/stm32f1/stm32-h103/usb_iap/usbiap.c
diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.ld b/examples/stm32f1/stm32-h103/usb_iap/usbiap.ld
similarity index 100%
rename from examples/stm32/stm32-h103/usb_iap/usbiap.ld
rename to examples/stm32f1/stm32-h103/usb_iap/usbiap.ld
diff --git a/examples/stm32/stm32-h107/fancyblink/Makefile b/examples/stm32f1/stm32-h107/fancyblink/Makefile
similarity index 100%
rename from examples/stm32/stm32-h107/fancyblink/Makefile
rename to examples/stm32f1/stm32-h107/fancyblink/Makefile
diff --git a/examples/stm32/stm32-h107/fancyblink/README b/examples/stm32f1/stm32-h107/fancyblink/README
similarity index 100%
rename from examples/stm32/stm32-h107/fancyblink/README
rename to examples/stm32f1/stm32-h107/fancyblink/README
diff --git a/examples/stm32/stm32-h107/fancyblink/fancyblink.c b/examples/stm32f1/stm32-h107/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32/stm32-h107/fancyblink/fancyblink.c
rename to examples/stm32f1/stm32-h107/fancyblink/fancyblink.c
diff --git a/examples/stm32/stm32-h107/fancyblink/fancyblink.ld b/examples/stm32f1/stm32-h107/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32/stm32-h107/fancyblink/fancyblink.ld
rename to examples/stm32f1/stm32-h107/fancyblink/fancyblink.ld
diff --git a/examples/stm32/stm32-h107/usb_simple/Makefile b/examples/stm32f1/stm32-h107/usb_simple/Makefile
similarity index 100%
rename from examples/stm32/stm32-h107/usb_simple/Makefile
rename to examples/stm32f1/stm32-h107/usb_simple/Makefile
diff --git a/examples/stm32/stm32-h107/usb_simple/README b/examples/stm32f1/stm32-h107/usb_simple/README
similarity index 100%
rename from examples/stm32/stm32-h107/usb_simple/README
rename to examples/stm32f1/stm32-h107/usb_simple/README
diff --git a/examples/stm32/stm32-h107/usb_simple/usb_simple.c b/examples/stm32f1/stm32-h107/usb_simple/usb_simple.c
similarity index 100%
rename from examples/stm32/stm32-h107/usb_simple/usb_simple.c
rename to examples/stm32f1/stm32-h107/usb_simple/usb_simple.c
diff --git a/examples/stm32/stm32-h107/usb_simple/usb_simple.ld b/examples/stm32f1/stm32-h107/usb_simple/usb_simple.ld
similarity index 100%
rename from examples/stm32/stm32-h107/usb_simple/usb_simple.ld
rename to examples/stm32f1/stm32-h107/usb_simple/usb_simple.ld

From 023b0a169581d2e7e640134035b505eda597dda3 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 02:52:37 -0700
Subject: [PATCH 30/51] Remove orphaned file in git.

---
 examples/stm32/Makefile.include | 136 --------------------------------
 1 file changed, 136 deletions(-)
 delete mode 100644 examples/stm32/Makefile.include

diff --git a/examples/stm32/Makefile.include b/examples/stm32/Makefile.include
deleted file mode 100644
index 3e306384..00000000
--- a/examples/stm32/Makefile.include
+++ /dev/null
@@ -1,136 +0,0 @@
-##
-## This file is part of the libopencm3 project.
-##
-## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
-## Copyright (C) 2010 Piotr Esden-Tempski <piotr@esden.net>
-##
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-##
-
-PREFIX	?= arm-none-eabi
-#PREFIX		?= arm-elf
-CC		= $(PREFIX)-gcc
-LD		= $(PREFIX)-gcc
-OBJCOPY		= $(PREFIX)-objcopy
-OBJDUMP		= $(PREFIX)-objdump
-GDB		= $(PREFIX)-gdb
-# Uncomment this line if you want to use the installed (not local) library.
-# TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
-TOOLCHAIN_DIR   = ../../../..
-CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
-		   -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD
-LDSCRIPT	= $(BINARY).ld
-LDFLAGS		+= -lc -lnosys -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32 \
-		   -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \
-		   -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
-OBJS		+= $(BINARY).o
-
-OOCD		?= openocd
-OOCD_INTERFACE	?= flossjtag
-OOCD_BOARD	?= olimex_stm32_h103
-# Black magic probe specific variables
-# Set the BMP_PORT to a serial port and then BMP is used for flashing
-BMP_PORT        ?=
-
-# Be silent per default, but 'make V=1' will show all compiler calls.
-ifneq ($(V),1)
-Q := @
-NULL := 2>/dev/null
-else
-LDFLAGS += -Wl,--print-gc-sections
-endif
-
-.SUFFIXES: .elf .bin .hex .srec .list .images
-.SECONDEXPANSION:
-.SECONDARY:
-
-all: images
-
-images: $(BINARY).images
-flash: $(BINARY).flash
-
-%.images: %.bin %.hex %.srec %.list
-	@#echo "*** $* images generated ***"
-
-%.bin: %.elf
-	@#printf "  OBJCOPY $(*).bin\n"
-	$(Q)$(OBJCOPY) -Obinary $(*).elf $(*).bin
-
-%.hex: %.elf
-	@#printf "  OBJCOPY $(*).hex\n"
-	$(Q)$(OBJCOPY) -Oihex $(*).elf $(*).hex
-
-%.srec: %.elf
-	@#printf "  OBJCOPY $(*).srec\n"
-	$(Q)$(OBJCOPY) -Osrec $(*).elf $(*).srec
-
-%.list: %.elf
-	@#printf "  OBJDUMP $(*).list\n"
-	$(Q)$(OBJDUMP) -S $(*).elf > $(*).list
-
-%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32/libopencm3_stm32.a
-	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32 $(LDFLAGS)
-
-%.o: %.c Makefile
-	@#printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(CC) $(CFLAGS) -o $@ -c $<
-
-clean:
-	$(Q)rm -f *.o
-	$(Q)rm -f *.d
-	$(Q)rm -f *.elf
-	$(Q)rm -f *.bin
-	$(Q)rm -f *.hex
-	$(Q)rm -f *.srec
-	$(Q)rm -f *.list
-
-ifeq ($(BMP_PORT),)
-ifeq ($(OOCD_SERIAL),)
-%.flash: %.hex
-	@printf "  FLASH   $<\n"
-	@# IMPORTANT: Don't use "resume", only "reset" will work correctly!
-	$(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \
-		    -f board/$(OOCD_BOARD).cfg \
-		    -c "init" -c "reset init" \
-		    -c "stm32x mass_erase 0" \
-		    -c "flash write_image $(*).hex" \
-		    -c "reset" \
-		    -c "shutdown" $(NULL)
-else
-%.flash: %.hex
-	@printf "  FLASH   $<\n"
-	@# IMPORTANT: Don't use "resume", only "reset" will work correctly!
-	$(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \
-		    -f board/$(OOCD_BOARD).cfg \
-		    -c "ft2232_serial $(OOCD_SERIAL)" \
-		    -c "init" -c "reset init" \
-		    -c "stm32x mass_erase 0" \
-		    -c "flash write_image $(*).hex" \
-		    -c "reset" \
-		    -c "shutdown" $(NULL)
-endif
-else
-%.flash: %.elf
-	@echo "  GDB   $(*).elf (flash)"
-	$(Q)$(GDB) --batch \
-		-ex 'target extended-remote $(BMP_PORT)' \
-		-x $(TOOLCHAIN_DIR)/scripts/black_magic_probe_flash.scr \
-		$(*).elf
-endif
-
-.PHONY: images clean
-
--include $(OBJS:.o=.d)
-

From cadbc0145bf2eb407f24987620636f4e52b293d4 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 02:53:16 -0700
Subject: [PATCH 31/51] First F2 example working!

---
 examples/stm32f2/Makefile.include             | 129 ++++++++++++++++++
 examples/stm32f2/jobygps/miniblink/Makefile   |  23 ++++
 examples/stm32f2/jobygps/miniblink/README     |   6 +
 .../stm32f2/jobygps/miniblink/miniblink.c     |  77 +++++++++++
 .../stm32f2/jobygps/miniblink/miniblink.ld    |  31 +++++
 5 files changed, 266 insertions(+)
 create mode 100644 examples/stm32f2/Makefile.include
 create mode 100644 examples/stm32f2/jobygps/miniblink/Makefile
 create mode 100644 examples/stm32f2/jobygps/miniblink/README
 create mode 100644 examples/stm32f2/jobygps/miniblink/miniblink.c
 create mode 100644 examples/stm32f2/jobygps/miniblink/miniblink.ld

diff --git a/examples/stm32f2/Makefile.include b/examples/stm32f2/Makefile.include
new file mode 100644
index 00000000..6ec9f65b
--- /dev/null
+++ b/examples/stm32f2/Makefile.include
@@ -0,0 +1,129 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2010 Piotr Esden-Tempski <piotr@esden.net>
+## Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+PREFIX	?= arm-none-eabi
+#PREFIX		?= arm-elf
+CC		= $(PREFIX)-gcc
+LD		= $(PREFIX)-gcc
+OBJCOPY		= $(PREFIX)-objcopy
+OBJDUMP		= $(PREFIX)-objdump
+# Uncomment this line if you want to use the installed (not local) library.
+#TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
+TOOLCHAIN_DIR   = ../../../..
+CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
+		   -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD -DSTM32F2
+LDSCRIPT	= $(BINARY).ld
+LDFLAGS		+= -lc -lnosys -L$(TOOLCHAIN_DIR)/lib \
+			 -L$(TOOLCHAIN_DIR)/lib/stm32f2 \
+		   -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \
+		   -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
+OBJS		+= $(BINARY).o
+
+OOCD		?= openocd
+OOCD_INTERFACE	?= flossjtag
+OOCD_BOARD	?= olimex_stm32_h103
+
+# Be silent per default, but 'make V=1' will show all compiler calls.
+ifneq ($(V),1)
+Q := @
+NULL := 2>/dev/null
+else
+LDFLAGS += -Wl,--print-gc-sections
+endif
+
+.SUFFIXES: .elf .bin .hex .srec .list .images
+.SECONDEXPANSION:
+.SECONDARY:
+
+all: images
+
+images: $(BINARY).images
+flash: $(BINARY).flash
+
+%.images: %.bin %.hex %.srec %.list
+	@#echo "*** $* images generated ***"
+
+%.bin: %.elf
+	@#printf "  OBJCOPY $(*).bin\n"
+	$(Q)$(OBJCOPY) -Obinary $(*).elf $(*).bin
+
+%.hex: %.elf
+	@#printf "  OBJCOPY $(*).hex\n"
+	$(Q)$(OBJCOPY) -Oihex $(*).elf $(*).hex
+
+%.srec: %.elf
+	@#printf "  OBJCOPY $(*).srec\n"
+	$(Q)$(OBJCOPY) -Osrec $(*).elf $(*).srec
+
+%.list: %.elf
+	@#printf "  OBJDUMP $(*).list\n"
+	$(Q)$(OBJDUMP) -S $(*).elf > $(*).list
+
+foo.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32f2/libopencm3_stm32f2.a
+	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(LD) -o foo.elf $(OBJS) -lopencm3_stm32f2 $(LDFLAGS)
+
+%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32f2/libopencm3_stm32f2.a
+	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32f2 $(LDFLAGS)
+
+%.o: %.c Makefile
+	@#printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(CC) $(CFLAGS) -o $@ -c $<
+
+clean:
+	$(Q)rm -f *.o
+	$(Q)rm -f *.d
+	$(Q)rm -f *.elf
+	$(Q)rm -f *.bin
+	$(Q)rm -f *.hex
+	$(Q)rm -f *.srec
+	$(Q)rm -f *.list
+
+ifeq ($(OOCD_SERIAL),)
+%.flash: %.hex
+	@printf "  FLASH   $<\n"
+	@# IMPORTANT: Don't use "resume", only "reset" will work correctly!
+	$(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \
+		    -f board/$(OOCD_BOARD).cfg \
+		    -c "init" -c "reset init" \
+		    -c "stm32x mass_erase 0" \
+		    -c "flash write_image $(*).hex" \
+		    -c "reset" \
+		    -c "shutdown" $(NULL)
+else
+%.flash: %.hex
+	@printf "  FLASH   $<\n"
+	@# IMPORTANT: Don't use "resume", only "reset" will work correctly!
+	$(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \
+		    -f board/$(OOCD_BOARD).cfg \
+		    -c "ft2232_serial $(OOCD_SERIAL)" \
+		    -c "init" -c "reset init" \
+		    -c "stm32x mass_erase 0" \
+		    -c "flash write_image $(*).hex" \
+		    -c "reset" \
+		    -c "shutdown" $(NULL)
+endif
+
+.PHONY: images clean
+
+-include $(OBJS:.o=.d)
+
diff --git a/examples/stm32f2/jobygps/miniblink/Makefile b/examples/stm32f2/jobygps/miniblink/Makefile
new file mode 100644
index 00000000..24a478b4
--- /dev/null
+++ b/examples/stm32f2/jobygps/miniblink/Makefile
@@ -0,0 +1,23 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+BINARY = miniblink
+
+include ../../Makefile.include
+
diff --git a/examples/stm32f2/jobygps/miniblink/README b/examples/stm32f2/jobygps/miniblink/README
new file mode 100644
index 00000000..01301125
--- /dev/null
+++ b/examples/stm32f2/jobygps/miniblink/README
@@ -0,0 +1,6 @@
+------------------------------------------------------------------------------
+README
+------------------------------------------------------------------------------
+
+This is the smallest-possible example program using libopencm3.
+
diff --git a/examples/stm32f2/jobygps/miniblink/miniblink.c b/examples/stm32f2/jobygps/miniblink/miniblink.c
new file mode 100644
index 00000000..2927df5e
--- /dev/null
+++ b/examples/stm32f2/jobygps/miniblink/miniblink.c
@@ -0,0 +1,77 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+//#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f2/gpio.h>
+
+void gpio_setup(void)
+{
+	/* Enable GPIOC clock. */
+	/* Manually: */
+	// RCC_APB2ENR |= RCC_APB2ENR_IOPCEN;
+	/* Using API functions: */
+	//rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+
+	/* Set GPIO12 (in GPIO port C) to 'output push-pull'. */
+	/* Manually: */
+	// GPIOC_CRH = (GPIO_CNF_OUTPUT_PUSHPULL << (((12 - 8) * 4) + 2));
+	// GPIOC_CRH |= (GPIO_MODE_OUTPUT_2_MHZ << ((12 - 8) * 4));
+	/* Using API functions: */
+	MMIO32(RCC_BASE+0x30) |= (1<<2);
+	gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO3|GPIO4);
+}
+
+int main(void)
+{
+	int i;
+
+	gpio_setup();
+
+	/* Blink the LED (PC12) on the board. */
+	while (1) {
+		/* Manually: */
+		// GPIOC_BSRR = GPIO12;		/* LED off */
+		// for (i = 0; i < 800000; i++)	/* Wait a bit. */
+		// 	__asm__("nop");
+		// GPIOC_BRR = GPIO12;		/* LED on */
+		// for (i = 0; i < 800000; i++)	/* Wait a bit. */
+		// 	__asm__("nop");
+
+		/* Using API functions gpio_set()/gpio_clear(): */
+		// gpio_set(GPIOC, GPIO12);	/* LED off */
+		// for (i = 0; i < 800000; i++)	/* Wait a bit. */
+		// 	__asm__("nop");
+		// gpio_clear(GPIOC, GPIO12);	/* LED on */
+		// for (i = 0; i < 800000; i++)	/* Wait a bit. */
+		// 	__asm__("nop");
+
+		/* Using API function gpio_toggle(): */
+		//gpio_toggle(GPIOC, GPIO3);	/* LED on/off */
+		gpio_set(GPIOC, GPIO3);
+		gpio_clear(GPIOC, GPIO4);
+		for (i = 0; i < 800000; i++)	/* Wait a bit. */
+			__asm__("nop");
+		gpio_clear(GPIOC, GPIO3);
+		gpio_set(GPIOC, GPIO4);
+		for (i = 0; i < 800000; i++)	/* Wait a bit. */
+			__asm__("nop");
+	}
+
+	return 0;
+}
diff --git a/examples/stm32f2/jobygps/miniblink/miniblink.ld b/examples/stm32f2/jobygps/miniblink/miniblink.ld
new file mode 100644
index 00000000..cfe9ab7b
--- /dev/null
+++ b/examples/stm32f2/jobygps/miniblink/miniblink.ld
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Linker script for Olimex STM32-H103 (STM32F103RBT6, 128K flash, 20K RAM). */
+
+/* Define memory regions. */
+MEMORY
+{
+	rom (rx) : ORIGIN = 0x08000000, LENGTH = 256K
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
+}
+
+/* Include the common ld script. */
+INCLUDE libopencm3_stm32f2.ld
+

From ca412a9ed2ab3bf5f4bdf54b7b300290931ab39b Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 14:59:55 -0700
Subject: [PATCH 32/51] Move systick to stm32 common.

---
 include/libopencm3/stm32/{f1 => }/systick.h | 0
 lib/{stm32f1 => stm32_common}/systick.c     | 2 +-
 lib/stm32f1/Makefile                        | 2 +-
 lib/stm32f2/Makefile                        | 3 ++-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename include/libopencm3/stm32/{f1 => }/systick.h (100%)
 rename lib/{stm32f1 => stm32_common}/systick.c (97%)

diff --git a/include/libopencm3/stm32/f1/systick.h b/include/libopencm3/stm32/systick.h
similarity index 100%
rename from include/libopencm3/stm32/f1/systick.h
rename to include/libopencm3/stm32/systick.h
diff --git a/lib/stm32f1/systick.c b/lib/stm32_common/systick.c
similarity index 97%
rename from lib/stm32f1/systick.c
rename to lib/stm32_common/systick.c
index 3308413b..882601da 100644
--- a/lib/stm32f1/systick.c
+++ b/lib/stm32_common/systick.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f1/systick.h>
+#include <libopencm3/stm32/systick.h>
 
 void systick_set_reload(u32 value)
 {
diff --git a/lib/stm32f1/Makefile b/lib/stm32f1/Makefile
index fa4dad14..bd9fca2b 100644
--- a/lib/stm32f1/Makefile
+++ b/lib/stm32f1/Makefile
@@ -33,7 +33,7 @@ OBJS		= vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \
 		  usb_f103.o usb.o usb_control.o usb_standard.o can.o \
 		  timer.o usb_f107.o
 
-VPATH += ../usb
+VPATH += ../usb:../stm32_common
 
 # Be silent per default, but 'make V=1' will show all compiler calls.
 ifneq ($(V),1)
diff --git a/lib/stm32f2/Makefile b/lib/stm32f2/Makefile
index 1f08089b..d52525b4 100644
--- a/lib/stm32f2/Makefile
+++ b/lib/stm32f2/Makefile
@@ -28,9 +28,10 @@ CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
 		  -ffunction-sections -fdata-sections -MD -DSTM32F2
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
-OBJS		= vector.o gpio.o
+OBJS		= vector.o gpio.o systick.o
 
 #VPATH += ../usb
+VPATH += ../stm32_common
 
 # Be silent per default, but 'make V=1' will show all compiler calls.
 ifneq ($(V),1)

From 72baa300ab82c184e156e170cae0dcd1fd665d12 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 15:06:28 -0700
Subject: [PATCH 33/51] Moved I2C to stm32 common.

---
 lib/{stm32f1 => stm32_common}/i2c.c | 0
 lib/stm32f2/Makefile                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/{stm32f1 => stm32_common}/i2c.c (100%)

diff --git a/lib/stm32f1/i2c.c b/lib/stm32_common/i2c.c
similarity index 100%
rename from lib/stm32f1/i2c.c
rename to lib/stm32_common/i2c.c
diff --git a/lib/stm32f2/Makefile b/lib/stm32f2/Makefile
index d52525b4..f3d6ff79 100644
--- a/lib/stm32f2/Makefile
+++ b/lib/stm32f2/Makefile
@@ -28,7 +28,7 @@ CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
 		  -ffunction-sections -fdata-sections -MD -DSTM32F2
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
-OBJS		= vector.o gpio.o systick.o
+OBJS		= vector.o gpio.o systick.o i2c.o
 
 #VPATH += ../usb
 VPATH += ../stm32_common

From 010ee532982ae8329f712967e7e3759fa432ce76 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 15:07:07 -0700
Subject: [PATCH 34/51] Moved SPI to stm32 common.

---
 lib/{stm32f1 => stm32_common}/spi.c | 0
 lib/stm32f2/Makefile                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/{stm32f1 => stm32_common}/spi.c (100%)

diff --git a/lib/stm32f1/spi.c b/lib/stm32_common/spi.c
similarity index 100%
rename from lib/stm32f1/spi.c
rename to lib/stm32_common/spi.c
diff --git a/lib/stm32f2/Makefile b/lib/stm32f2/Makefile
index f3d6ff79..ba0ae043 100644
--- a/lib/stm32f2/Makefile
+++ b/lib/stm32f2/Makefile
@@ -28,7 +28,7 @@ CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
 		  -ffunction-sections -fdata-sections -MD -DSTM32F2
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
-OBJS		= vector.o gpio.o systick.o i2c.o
+OBJS		= vector.o gpio.o systick.o i2c.o spi.o
 
 #VPATH += ../usb
 VPATH += ../stm32_common

From 4d02d36d6b16e96eda731c9adbbbadd694371700 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 15 Sep 2011 16:26:39 -0700
Subject: [PATCH 35/51] Moving nvic code to common, adding F1 and F2 specific
 user interrupt definition headers.

---
 include/libopencm3/stm32/f1/nvic_f1.h    |  99 ++++++++++++++++++++
 include/libopencm3/stm32/f2/nvic_f2.h    | 112 +++++++++++++++++++++++
 include/libopencm3/stm32/{f1 => }/nvic.h |  84 +++--------------
 lib/{stm32f1 => stm32_common}/nvic.c     |   2 +-
 lib/stm32f2/Makefile                     |   2 +-
 5 files changed, 228 insertions(+), 71 deletions(-)
 create mode 100644 include/libopencm3/stm32/f1/nvic_f1.h
 create mode 100644 include/libopencm3/stm32/f2/nvic_f2.h
 rename include/libopencm3/stm32/{f1 => }/nvic.h (61%)
 rename lib/{stm32f1 => stm32_common}/nvic.c (98%)

diff --git a/include/libopencm3/stm32/f1/nvic_f1.h b/include/libopencm3/stm32/f1/nvic_f1.h
new file mode 100644
index 00000000..b0b32a0f
--- /dev/null
+++ b/include/libopencm3/stm32/f1/nvic_f1.h
@@ -0,0 +1,99 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2010 Piotr Esden-Tempski <piotr@esden.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_NVIC_F1_H
+#define LIBOPENCM3_NVIC_F1_H
+
+/* --- IRQ channel numbers-------------------------------------------------- */
+
+/* Note: These F1 specific user interrupt definitions supplement the
+ * general NVIC definitions in ../nvic.h
+ */
+
+/* User Interrupts */
+#define NVIC_WWDG_IRQ			0
+#define NVIC_PVD_IRQ			1
+#define NVIC_TAMPER_IRQ			2
+#define NVIC_RTC_IRQ			3
+#define NVIC_FLASH_IRQ			4
+#define NVIC_RCC_IRQ			5
+#define NVIC_EXTI0_IRQ			6
+#define NVIC_EXTI1_IRQ			7
+#define NVIC_EXTI2_IRQ			8
+#define NVIC_EXTI3_IRQ			9
+#define NVIC_EXTI4_IRQ			10
+#define NVIC_DMA1_CHANNEL1_IRQ		11
+#define NVIC_DMA1_CHANNEL2_IRQ		12
+#define NVIC_DMA1_CHANNEL3_IRQ		13
+#define NVIC_DMA1_CHANNEL4_IRQ		14
+#define NVIC_DMA1_CHANNEL5_IRQ		15
+#define NVIC_DMA1_CHANNEL6_IRQ		16
+#define NVIC_DMA1_CHANNEL7_IRQ		17
+#define NVIC_ADC1_2_IRQ			18
+#define NVIC_USB_HP_CAN_TX_IRQ		19
+#define NVIC_USB_LP_CAN_RX0_IRQ		20
+#define NVIC_CAN_RX1_IRQ		21
+#define NVIC_CAN_SCE_IRQ		22
+#define NVIC_EXTI9_5_IRQ		23
+#define NVIC_TIM1_BRK_IRQ		24
+#define NVIC_TIM1_UP_IRQ		25
+#define NVIC_TIM1_TRG_COM_IRQ		26
+#define NVIC_TIM1_CC_IRQ		27
+#define NVIC_TIM2_IRQ			28
+#define NVIC_TIM3_IRQ			29
+#define NVIC_TIM4_IRQ			30
+#define NVIC_I2C1_EV_IRQ		31
+#define NVIC_I2C1_ER_IRQ		32
+#define NVIC_I2C2_EV_IRQ		33
+#define NVIC_I2C2_ER_IRQ		34
+#define NVIC_SPI1_IRQ			35
+#define NVIC_SPI2_IRQ			36
+#define NVIC_USART1_IRQ			37
+#define NVIC_USART2_IRQ			38
+#define NVIC_USART3_IRQ			39
+#define NVIC_EXTI15_10_IRQ		40
+#define NVIC_RTC_ALARM_IRQ		41
+#define NVIC_USB_WAKEUP_IRQ		42
+#define NVIC_TIM8_BRK_IRQ		43
+#define NVIC_TIM8_UP_IRQ		44
+#define NVIC_TIM8_TRG_COM_IRQ		45
+#define NVIC_TIM8_CC_IRQ		46
+#define NVIC_ADC3_IRQ			47
+#define NVIC_FSMC_IRQ			48
+#define NVIC_SDIO_IRQ			49
+#define NVIC_TIM5_IRQ			50
+#define NVIC_SPI3_IRQ			51
+#define NVIC_USART4_IRQ			52
+#define NVIC_USART5_IRQ			53
+#define NVIC_TIM6_IRQ			54
+#define NVIC_TIM7_IRQ			55
+#define NVIC_DMA2_CHANNEL1_IRQ		56
+#define NVIC_DMA2_CHANNEL2_IRQ		57
+#define NVIC_DMA2_CHANNEL3_IRQ		58
+#define NVIC_DMA2_CHANNEL4_5_IRQ	59
+#define NVIC_DMA2_CHANNEL5_IRQ		60
+#define NVIC_ETH_IRQ			61
+#define NVIC_ETH_WKUP_IRQ		62
+#define NVIC_CAN2_TX_IRQ		63
+#define NVIC_CAN2_RX0_IRQ		64
+#define NVIC_CAN2_RX1_IRQ		65
+#define NVIC_CAN2_SCE_IRQ		66
+#define NVIC_OTG_FS_IRQ			67
+
+#endif
diff --git a/include/libopencm3/stm32/f2/nvic_f2.h b/include/libopencm3/stm32/f2/nvic_f2.h
new file mode 100644
index 00000000..2545f0a1
--- /dev/null
+++ b/include/libopencm3/stm32/f2/nvic_f2.h
@@ -0,0 +1,112 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_NVIC_F2_H
+#define LIBOPENCM3_NVIC_F2_H
+
+/* --- IRQ channel numbers-------------------------------------------------- */
+
+/* Note: These F2 specific user interrupt definitions supplement the
+ * general NVIC definitions in ../nvic.h
+ */
+
+/* User Interrupts */
+#define NVIC_WWDG_IRQ          0
+#define PVD_IRQ                1
+#define TAMP_STAMP_IRQ         2
+#define RTC_WKUP_IRQ           3
+#define FLASH_IRQ              4
+#define RCC_IRQ                5
+#define EXTI0_IRQ              6
+#define EXTI1_IRQ              7
+#define EXTI2_IRQ              8
+#define EXTI3_IRQ              9
+#define EXTI4_IRQ              10
+#define DMA1_STREAM0_IRQ       11
+#define DMA1_STREAM1_IRQ       12
+#define DMA1_STREAM2_IRQ       13
+#define DMA1_STREAM3_IRQ       14
+#define DMA1_STREAM4_IRQ       15
+#define DMA1_STREAM5_IRQ       16
+#define DMA1_STREAM6_IRQ       17
+#define ADC_IRQ                18
+#define CAN1_TX_IRQ            19
+#define CAN1_RX0_IRQ           20
+#define CAN1_RX1_IRQ           21
+#define CAN1_SCE_IRQ           22
+#define EXTI9_5_IRQ            23
+#define TIM1_BRK_TIM9_IRQ      24
+#define TIM1_UP_TIM10_IRQ      25
+#define TIM1_TRG_COM_TIM11_IRQ 26
+#define TIM1_CC_IRQ            27
+#define TIM2_IRQ               28
+#define TIM3_IRQ               29
+#define TIM4_IRQ               30
+#define I2C1_EV_IRQ            31
+#define I2C1_ER_IRQ            32
+#define I2C2_EV_IRQ            33
+#define I2C2_ER_IRQ            34
+#define SPI1_IRQ               35
+#define SPI2_IRQ               36
+#define USART1_IRQ             37
+#define USART2_IRQ             38
+#define USART3_IRQ             39
+#define EXTI15_10_IRQ          40
+#define RTC_ALARM_IRQ          41
+#define USB_FS_WKUP_IRQ        42
+#define TIM8_BRK_TIM12_IRQ     43
+#define TIM8_UP_TIM13_IRQ      44
+#define TIM8_TRG_COM_TIM14_IRQ 45
+#define TIM8_CC_IRQ            46
+#define DMA1_STREAM7_IRQ       47
+#define FSMC_IRQ               48
+#define SDIO_IRQ               49
+#define TIM5_IRQ               50
+#define SPI3_IRQ               51
+#define USART4_IRQ             52
+#define USART5_IRQ             53
+#define TIM6_DAC_IRQ           54
+#define TIM7_IRQ               55
+#define DMA2_STREAM0_IRQ       56
+#define DMA2_STREAM1_IRQ       57
+#define DMA2_STREAM2_IRQ       58
+#define DMA2_STREAM3_IRQ       59
+#define DMA2_STREAM4_IRQ       60
+#define ETH_IRQ                61
+#define ETH_WKUP_IRQ           62
+#define CAN2_TX_IRQ            63
+#define CAN2_RX0_IRQ           64
+#define CAN2_RX1_IRQ           65
+#define CAN2_SCE_IRQ           66
+#define OTG_FS_IRQ             67
+#define DMA2_STREAM5_IRQ       68
+#define DMA2_STREAM6_IRQ       69
+#define DMA2_STREAM7_IRQ       70
+#define USART6_IRQ             71
+#define I2C3_EV_IRQ            72
+#define I2C3_ER_IRQ            73
+#define OTG_HS_EP1_OUT_IRQ     74
+#define OTG_HS_EP1_IN_IRQ      75
+#define OTG_HS_WKUP_IRQ        76
+#define OTG_HS_IRQ             77
+#define DCMI_IRQ               78
+#define CRYP_IRQ               79
+#define HASH_RNG_IRQ           80
+
+#endif
diff --git a/include/libopencm3/stm32/f1/nvic.h b/include/libopencm3/stm32/nvic.h
similarity index 61%
rename from include/libopencm3/stm32/f1/nvic.h
rename to include/libopencm3/stm32/nvic.h
index d29c425f..339a159c 100644
--- a/include/libopencm3/stm32/f1/nvic.h
+++ b/include/libopencm3/stm32/nvic.h
@@ -77,75 +77,21 @@
 #define NVIC_PENDSV_IRQ			-2
 #define NVIC_SYSTICK_IRQ		-1
 
-/* User Interrupts */
-#define NVIC_WWDG_IRQ			0
-#define NVIC_PVD_IRQ			1
-#define NVIC_TAMPER_IRQ			2
-#define NVIC_RTC_IRQ			3
-#define NVIC_FLASH_IRQ			4
-#define NVIC_RCC_IRQ			5
-#define NVIC_EXTI0_IRQ			6
-#define NVIC_EXTI1_IRQ			7
-#define NVIC_EXTI2_IRQ			8
-#define NVIC_EXTI3_IRQ			9
-#define NVIC_EXTI4_IRQ			10
-#define NVIC_DMA1_CHANNEL1_IRQ		11
-#define NVIC_DMA1_CHANNEL2_IRQ		12
-#define NVIC_DMA1_CHANNEL3_IRQ		13
-#define NVIC_DMA1_CHANNEL4_IRQ		14
-#define NVIC_DMA1_CHANNEL5_IRQ		15
-#define NVIC_DMA1_CHANNEL6_IRQ		16
-#define NVIC_DMA1_CHANNEL7_IRQ		17
-#define NVIC_ADC1_2_IRQ			18
-#define NVIC_USB_HP_CAN_TX_IRQ		19
-#define NVIC_USB_LP_CAN_RX0_IRQ		20
-#define NVIC_CAN_RX1_IRQ		21
-#define NVIC_CAN_SCE_IRQ		22
-#define NVIC_EXTI9_5_IRQ		23
-#define NVIC_TIM1_BRK_IRQ		24
-#define NVIC_TIM1_UP_IRQ		25
-#define NVIC_TIM1_TRG_COM_IRQ		26
-#define NVIC_TIM1_CC_IRQ		27
-#define NVIC_TIM2_IRQ			28
-#define NVIC_TIM3_IRQ			29
-#define NVIC_TIM4_IRQ			30
-#define NVIC_I2C1_EV_IRQ		31
-#define NVIC_I2C1_ER_IRQ		32
-#define NVIC_I2C2_EV_IRQ		33
-#define NVIC_I2C2_ER_IRQ		34
-#define NVIC_SPI1_IRQ			35
-#define NVIC_SPI2_IRQ			36
-#define NVIC_USART1_IRQ			37
-#define NVIC_USART2_IRQ			38
-#define NVIC_USART3_IRQ			39
-#define NVIC_EXTI15_10_IRQ		40
-#define NVIC_RTC_ALARM_IRQ		41
-#define NVIC_USB_WAKEUP_IRQ		42
-#define NVIC_TIM8_BRK_IRQ		43
-#define NVIC_TIM8_UP_IRQ		44
-#define NVIC_TIM8_TRG_COM_IRQ		45
-#define NVIC_TIM8_CC_IRQ		46
-#define NVIC_ADC3_IRQ			47
-#define NVIC_FSMC_IRQ			48
-#define NVIC_SDIO_IRQ			49
-#define NVIC_TIM5_IRQ			50
-#define NVIC_SPI3_IRQ			51
-#define NVIC_USART4_IRQ			52
-#define NVIC_USART5_IRQ			53
-#define NVIC_TIM6_IRQ			54
-#define NVIC_TIM7_IRQ			55
-#define NVIC_DMA2_CHANNEL1_IRQ		56
-#define NVIC_DMA2_CHANNEL2_IRQ		57
-#define NVIC_DMA2_CHANNEL3_IRQ		58
-#define NVIC_DMA2_CHANNEL4_5_IRQ	59
-#define NVIC_DMA2_CHANNEL5_IRQ		60
-#define NVIC_ETH_IRQ			61
-#define NVIC_ETH_WKUP_IRQ		62
-#define NVIC_CAN2_TX_IRQ		63
-#define NVIC_CAN2_RX0_IRQ		64
-#define NVIC_CAN2_RX1_IRQ		65
-#define NVIC_CAN2_SCE_IRQ		66
-#define NVIC_OTG_FS_IRQ			67
+
+/* Note: User interrupts are family specific and are defined in a familiy
+ * specific header file in the corresponding subfolder.
+ */
+
+#ifdef STM32F1
+#include <libopencm3/stm32/f1/nvic_f1.h>
+#else
+#ifdef STM32F2
+#include <libopencm3/stm32/f2/nvic_f2.h>
+#else
+#error "stm32 family not defined."
+#endif
+#endif
+
 
 /* --- NVIC functions ------------------------------------------------------ */
 
diff --git a/lib/stm32f1/nvic.c b/lib/stm32_common/nvic.c
similarity index 98%
rename from lib/stm32f1/nvic.c
rename to lib/stm32_common/nvic.c
index f45b601b..cf77cc38 100644
--- a/lib/stm32f1/nvic.c
+++ b/lib/stm32_common/nvic.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f1/nvic.h>
+#include <libopencm3/stm32/nvic.h>
 
 void nvic_enable_irq(u8 irqn)
 {
diff --git a/lib/stm32f2/Makefile b/lib/stm32f2/Makefile
index ba0ae043..cd50c4b8 100644
--- a/lib/stm32f2/Makefile
+++ b/lib/stm32f2/Makefile
@@ -28,7 +28,7 @@ CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
 		  -ffunction-sections -fdata-sections -MD -DSTM32F2
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
-OBJS		= vector.o gpio.o systick.o i2c.o spi.o
+OBJS		= vector.o gpio.o systick.o i2c.o spi.o nvic.o
 
 #VPATH += ../usb
 VPATH += ../stm32_common

From 0565cb837815f4086b03ddf090dcada82f30e9c4 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Fri, 16 Sep 2011 17:34:08 -0700
Subject: [PATCH 36/51] RCC header file for F2 implemented, no convenience
 functions so far.

---
 include/libopencm3/stm32/f2/rcc.h | 453 ++++++++++++++++++++++++++++++
 1 file changed, 453 insertions(+)
 create mode 100644 include/libopencm3/stm32/f2/rcc.h

diff --git a/include/libopencm3/stm32/f2/rcc.h b/include/libopencm3/stm32/f2/rcc.h
new file mode 100644
index 00000000..430ce77c
--- /dev/null
+++ b/include/libopencm3/stm32/f2/rcc.h
@@ -0,0 +1,453 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+ * Copyright (C) 2009 Federico Ruiz-Ugalde <memeruiz at gmail dot com>
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_RCC_H
+#define LIBOPENCM3_RCC_H
+
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
+
+/* --- RCC registers ------------------------------------------------------- */
+
+#define RCC_CR                 MMIO32(RCC_BASE + 0x00)
+#define RCC_PLLCFGR            MMIO32(RCC_BASE + 0x04)
+#define RCC_CFGR               MMIO32(RCC_BASE + 0x08)
+#define RCC_CIR                MMIO32(RCC_BASE + 0x0c)
+#define RCC_AHB1RSTR           MMIO32(RCC_BASE + 0x10)
+#define RCC_AHB2RSTR           MMIO32(RCC_BASE + 0x14)
+#define RCC_AHB3RSTR           MMIO32(RCC_BASE + 0x18)
+/* RCC_BASE + 0x1C Reserved */
+#define RCC_APB1RSTR           MMIO32(RCC_BASE + 0x20)
+#define RCC_APB2RSTR           MMIO32(RCC_BASE + 0x24)
+/* RCC_BASE + 0x28 Reserved */
+/* RCC_BASE + 0x2C Reserved */
+#define RCC_AHB1ENR            MMIO32(RCC_BASE + 0x30)
+#define RCC_AHB2ENR            MMIO32(RCC_BASE + 0x34)
+#define RCC_AHB3ENR            MMIO32(RCC_BASE + 0x38)
+/* RCC_BASE + 0x3C Reserved */
+#define RCC_APB1ENR            MMIO32(RCC_BASE + 0x40)
+#define RCC_APB2ENR            MMIO32(RCC_BASE + 0x44)
+/* RCC_BASE + 0x48 Reserved */
+/* RCC_BASE + 0x4C Reserved */
+#define RCC_AHB1LPENR          MMIO32(RCC_BASE + 0x50)
+#define RCC_AHB2LPENR          MMIO32(RCC_BASE + 0x54)
+#define RCC_AHB3LPENR          MMIO32(RCC_BASE + 0x58)
+/* RCC_BASE + 0x5C Reserved */
+#define RCC_APB1LPENR          MMIO32(RCC_BASE + 0x60)
+#define RCC_APB2LPENR          MMIO32(RCC_BASE + 0x64)
+/* RCC_BASE + 0x68 Reserved */
+/* RCC_BASE + 0x6C Reserved */
+#define RCC_BDCR               MMIO32(RCC_BASE + 0x70)
+#define RCC_CSR                MMIO32(RCC_BASE + 0x74)
+/* RCC_BASE + 0x78 Reserved */
+/* RCC_BASE + 0x7C Reserved */
+#define RCC_SSCGR              MMIO32(RCC_BASE + 0x80)
+#define RCC_PLLI2SCFGR         MMIO32(RCC_BASE + 0x84)
+
+/* --- RCC_CR values ------------------------------------------------------- */
+
+#define RCC_CR_PLLI2SRDY		(1 << 27)
+#define RCC_CR_PLLI2SON			(1 << 26)
+#define RCC_CR_PLLRDY				(1 << 25)
+#define RCC_CR_PLLON				(1 << 24)
+#define RCC_CR_CSSON				(1 << 19)
+#define RCC_CR_HSEBYP				(1 << 18)
+#define RCC_CR_HSERDY				(1 << 17)
+#define RCC_CR_HSEON				(1 << 16)
+/* HSICAL: [15:8] */
+/* HSITRIM: [7:3] */
+#define RCC_CR_HSIRDY				(1 << 1)
+#define RCC_CR_HSION				(1 << 0)
+
+/* --- RCC_PLLCFGR values ------------------------------------------------------- */
+
+/* PLLQ: [27:24] */
+#define RCC_PLLCFGR_PLLQ_SHIFT 24
+#define RCC_PLLCFGR_PLLSRC (1 << 22)
+/* PLLP: [17:16] */
+#define RCC_PLLCFGR_PLLP_SHIFT 16
+/* PLLN: [14:6] */
+#define RCC_PLLCFGR_PLLN_SHIFT 6
+/* PLLM: [5:0] */
+#define RCC_PLLCFGR_PLLM_SHIFT 0
+
+/* --- RCC_CFGR values ----------------------------------------------------- */
+
+/* MCO2: Microcontroller clock output 2 */
+#define RCC_CFGR_MCO2_SHIFT 30
+#define RCC_CFGR_MCO2_SYSCLK	0x0
+#define RCC_CFGR_MCO2_PLLI2S	0x1
+#define RCC_CFGR_MCO2_HSE		0x2
+#define RCC_CFGR_MCO2_PLL		0x3 
+
+/* MCO1/2PRE: MCO Prescalers */
+#define RCC_CFGR_MCO2PRE_SHIFT 27
+#define RCC_CFGR_MCO1PRE_SHIFT 24
+#define RCC_CFGR_MCOPRE_DIV_NONE	0x0
+#define RCC_CFGR_MCOPRE_DIV_2			0x4
+#define RCC_CFGR_MCOPRE_DIV_3			0x5
+#define RCC_CFGR_MCOPRE_DIV_4			0x6
+#define RCC_CFGR_MCOPRE_DIV_5			0x7 
+
+/* I2SSRC: I2S clock selection */
+#define RCC_CFGR_I2SSRC (1 << 23)
+
+/* MCO1: Microcontroller clock output 1 */
+#define RCC_CFGR_MCO1_SHIFT 21
+#define RCC_CFGR_MCO1_HSI			0x0
+#define RCC_CFGR_MCO1_LSE			0x1
+#define RCC_CFGR_MCO1_HSE			0x2
+#define RCC_CFGR_MCO1_PLL			0x3 
+
+/* RTCPRE: HSE division factor for RTC clock */
+#define RCC_CFGR_RTCPRE_SHIFT 21
+
+/* PPRE1/2: APB high-speed prescalers */
+#define RCC_CFGR_PPRE2_SHIFT 13
+#define RCC_CFGR_PPRE1_SHIFT 10
+#define RCC_CFGR_PPRE_DIV_NONE	0x0
+#define RCC_CFGR_PPRE_DIV_2			0x4
+#define RCC_CFGR_PPRE_DIV_4			0x5
+#define RCC_CFGR_PPRE_DIV_8			0x6
+#define RCC_CFGR_PPRE_DIV_16		0x7 
+
+/* HPRE: AHB high-speed prescaler */
+#define RCC_CFGR_HPRE_SHIFT 4
+#define RCC_CFGR_HPRE_DIV_NONE	0x0
+#define RCC_CFGR_HPRE_DIV_2			(0x8+0)
+#define RCC_CFGR_HPRE_DIV_4			(0x8+1)
+#define RCC_CFGR_HPRE_DIV_8			(0x8+2)
+#define RCC_CFGR_HPRE_DIV_16		(0x8+3)
+#define RCC_CFGR_HPRE_DIV_64		(0x8+4)
+#define RCC_CFGR_HPRE_DIV_128		(0x8+5)
+#define RCC_CFGR_HPRE_DIV_256		(0x8+6)
+#define RCC_CFGR_HPRE_DIV_512		(0x8+7)
+
+/* SWS: System clock switch status */
+#define RCC_CFGR_SWS_SHIFT 2
+#define RCC_CFGR_SWS_HSI   0x0
+#define RCC_CFGR_SWS_HSE	 0x1
+#define RCC_CFGR_SWS_PLL	 0x2 
+
+/* SW: System clock switch */
+#define RCC_CFGR_SW_SHIFT 0
+#define RCC_CFGR_SW_HSI   0x0
+#define RCC_CFGR_SW_HSE	 0x1
+#define RCC_CFGR_SW_PLL	 0x2 
+
+/* --- RCC_CIR values ------------------------------------------------------ */
+
+/* Clock security system interrupt clear bit */
+#define RCC_CIR_CSSC				(1 << 23)
+
+/* OSC ready interrupt clear bits */
+#define RCC_CIR_PLLI2SRDYC		(1 << 21) 
+#define RCC_CIR_PLLRDYC				(1 << 20)
+#define RCC_CIR_HSERDYC				(1 << 19)
+#define RCC_CIR_HSIRDYC				(1 << 18)
+#define RCC_CIR_LSERDYC				(1 << 17)
+#define RCC_CIR_LSIRDYC				(1 << 16)
+
+/* OSC ready interrupt enable bits */
+#define RCC_CIR_PLLI2SRDYIE		(1 << 13) 
+#define RCC_CIR_PLLRDYIE			(1 << 12)
+#define RCC_CIR_HSERDYIE			(1 << 11)
+#define RCC_CIR_HSIRDYIE			(1 << 10)
+#define RCC_CIR_LSERDYIE			(1 << 9)
+#define RCC_CIR_LSIRDYIE			(1 << 8)
+
+/* Clock security system interrupt flag bit */
+#define RCC_CIR_CSSF				(1 << 7)
+
+/* OSC ready interrupt flag bits */
+#define RCC_CIR_PLLI2SRDYF		(1 << 5) 
+#define RCC_CIR_PLLRDYF				(1 << 4)
+#define RCC_CIR_HSERDYF				(1 << 3)
+#define RCC_CIR_HSIRDYF				(1 << 2)
+#define RCC_CIR_LSERDYF				(1 << 1)
+#define RCC_CIR_LSIRDYF				(1 << 0)
+
+/* --- RCC_AHB1RSTR values ------------------------------------------------- */
+
+#define RCC_AHB1RSTR_OTGHSRST			(1 << 29) 
+#define RCC_AHB1RSTR_ETHMACRST		(1 << 25) 
+#define RCC_AHB1RSTR_DMA2RST			(1 << 22) 
+#define RCC_AHB1RSTR_DMA1RST			(1 << 21) 
+#define RCC_AHB1RSTR_CRCRST				(1 << 12) 
+#define RCC_AHB1RSTR_GPIOIRST			(1 << 8) 
+#define RCC_AHB1RSTR_GPIOHRST			(1 << 7) 
+#define RCC_AHB1RSTR_GPIOGRST			(1 << 6) 
+#define RCC_AHB1RSTR_GPIOFRST			(1 << 5) 
+#define RCC_AHB1RSTR_GPIOERST			(1 << 4) 
+#define RCC_AHB1RSTR_GPIODRST			(1 << 3) 
+#define RCC_AHB1RSTR_GPIOCRST			(1 << 2) 
+#define RCC_AHB1RSTR_GPIOBRST			(1 << 1) 
+#define RCC_AHB1RSTR_GPIOARST			(1 << 0) 
+
+/* --- RCC_AHB2RSTR values ------------------------------------------------- */
+
+#define RCC_AHB2RSTR_OTGFSRST			(1 << 7) 
+#define RCC_AHB2RSTR_RNGRST				(1 << 6) 
+#define RCC_AHB2RSTR_HASHRST			(1 << 5) 
+#define RCC_AHB2RSTR_CRYPRST			(1 << 4) 
+#define RCC_AHB2RSTR_DCMIRST			(1 << 0) 
+
+/* --- RCC_AHB3RSTR values ------------------------------------------------- */
+
+#define RCC_AHB3RSTR_FSMCRST			(1 << 0) 
+
+/* --- RCC_APB1RSTR values ------------------------------------------------- */
+
+#define RCC_APB1RSTR_DACRST			(1 << 29)
+#define RCC_APB1RSTR_PWRRST			(1 << 28)
+#define RCC_APB1RSTR_CAN2RST			(1 << 26) 
+#define RCC_APB1RSTR_CAN1RST			(1 << 25) 
+#define RCC_APB1RSTR_I2C3RST			(1 << 23) 
+#define RCC_APB1RSTR_I2C2RST			(1 << 22)
+#define RCC_APB1RSTR_I2C1RST			(1 << 21)
+#define RCC_APB1RSTR_USART5RST			(1 << 20)
+#define RCC_APB1RSTR_USART4RST			(1 << 19)
+#define RCC_APB1RSTR_USART3RST			(1 << 18)
+#define RCC_APB1RSTR_USART2RST			(1 << 17)
+#define RCC_APB1RSTR_SPI3RST			(1 << 15)
+#define RCC_APB1RSTR_SPI2RST			(1 << 14)
+#define RCC_APB1RSTR_WWDGRST			(1 << 11)
+#define RCC_APB1RSTR_TIM14RST			(1 << 8)
+#define RCC_APB1RSTR_TIM13RST			(1 << 7)
+#define RCC_APB1RSTR_TIM12RST			(1 << 6)
+#define RCC_APB1RSTR_TIM7RST			(1 << 5)
+#define RCC_APB1RSTR_TIM6RST			(1 << 4)
+#define RCC_APB1RSTR_TIM5RST			(1 << 3)
+#define RCC_APB1RSTR_TIM4RST			(1 << 2)
+#define RCC_APB1RSTR_TIM3RST			(1 << 1)
+#define RCC_APB1RSTR_TIM2RST			(1 << 0)
+
+/* --- RCC_APB2RSTR values ------------------------------------------------- */
+
+#define RCC_APB2RSTR_TIM11RST			(1 << 18) 
+#define RCC_APB2RSTR_TIM10RST			(1 << 17) 
+#define RCC_APB2RSTR_TIM9RST			(1 << 16) 
+#define RCC_APB2RSTR_SYSCFGRST		(1 << 14)
+#define RCC_APB2RSTR_SPI1RST			(1 << 12)
+#define RCC_APB2RSTR_SDIORST			(1 << 11)
+#define RCC_APB2RSTR_ADCRST		  	(1 << 8)  
+#define RCC_APB2RSTR_USART6RST		(1 << 5)
+#define RCC_APB2RSTR_USART1RST		(1 << 4)
+#define RCC_APB2RSTR_TIM8RST			(1 << 1) 
+#define RCC_APB2RSTR_TIM1RST			(1 << 0) 
+
+/* --- RCC_AHB1ENR values ------------------------------------------------- */
+
+#define RCC_AHB1ENR_OTGHSULPIEN	(1 << 30) 
+#define RCC_AHB1ENR_OTGHSEN			(1 << 29) 
+#define RCC_AHB1ENR_ETHMACPTPEN	(1 << 28) 
+#define RCC_AHB1ENR_ETHMACRXEN	(1 << 27) 
+#define RCC_AHB1ENR_ETHMACTXEN	(1 << 26) 
+#define RCC_AHB1ENR_ETHMACEN		(1 << 25) 
+#define RCC_AHB1ENR_DMA2EN			(1 << 22) 
+#define RCC_AHB1ENR_DMA1EN			(1 << 21) 
+#define RCC_AHB1ENR_BKPSRAMEN		(1 << 18) 
+#define RCC_AHB1ENR_CRCEN				(1 << 12) 
+#define RCC_AHB1ENR_GPIOIEN			(1 << 8) 
+#define RCC_AHB1ENR_GPIOHEN			(1 << 7) 
+#define RCC_AHB1ENR_GPIOGEN			(1 << 6) 
+#define RCC_AHB1ENR_GPIOFEN			(1 << 5) 
+#define RCC_AHB1ENR_GPIOEEN			(1 << 4) 
+#define RCC_AHB1ENR_GPIODEN			(1 << 3) 
+#define RCC_AHB1ENR_GPIOCEN			(1 << 2) 
+#define RCC_AHB1ENR_GPIOBEN			(1 << 1) 
+#define RCC_AHB1ENR_GPIOAEN			(1 << 0) 
+
+/* --- RCC_AHB2ENR values ------------------------------------------------- */
+
+#define RCC_AHB2ENR_OTGFSEN			(1 << 7) 
+#define RCC_AHB2ENR_RNGEN				(1 << 6) 
+#define RCC_AHB2ENR_HASHEN			(1 << 5) 
+#define RCC_AHB2ENR_CRYPEN			(1 << 4) 
+#define RCC_AHB2ENR_DCMIEN			(1 << 0) 
+
+/* --- RCC_AHB3ENR values ------------------------------------------------- */
+
+#define RCC_AHB3ENR_FSMCEN			(1 << 0) 
+
+/* --- RCC_APB1ENR values ------------------------------------------------- */
+
+#define RCC_APB1ENR_DACEN			  (1 << 29)
+#define RCC_APB1ENR_PWREN		  	(1 << 28)
+#define RCC_APB1ENR_CAN2EN			(1 << 26) 
+#define RCC_APB1ENR_CAN1EN			(1 << 25) 
+#define RCC_APB1ENR_I2C3EN			(1 << 23) 
+#define RCC_APB1ENR_I2C2EN			(1 << 22)
+#define RCC_APB1ENR_I2C1EN			(1 << 21)
+#define RCC_APB1ENR_USART5EN		(1 << 20)
+#define RCC_APB1ENR_USART4EN		(1 << 19)
+#define RCC_APB1ENR_USART3EN		(1 << 18)
+#define RCC_APB1ENR_USART2EN		(1 << 17)
+#define RCC_APB1ENR_SPI3EN			(1 << 15)
+#define RCC_APB1ENR_SPI2EN			(1 << 14)
+#define RCC_APB1ENR_WWDGEN			(1 << 11)
+#define RCC_APB1ENR_TIM14EN			(1 << 8)
+#define RCC_APB1ENR_TIM13EN			(1 << 7)
+#define RCC_APB1ENR_TIM12EN			(1 << 6)
+#define RCC_APB1ENR_TIM7EN			(1 << 5)
+#define RCC_APB1ENR_TIM6EN			(1 << 4)
+#define RCC_APB1ENR_TIM5EN			(1 << 3)
+#define RCC_APB1ENR_TIM4EN			(1 << 2)
+#define RCC_APB1ENR_TIM3EN			(1 << 1)
+#define RCC_APB1ENR_TIM2EN			(1 << 0)
+
+/* --- RCC_APB2ENR values ------------------------------------------------- */
+
+#define RCC_APB2ENR_TIM11EN			(1 << 18) 
+#define RCC_APB2ENR_TIM10EN			(1 << 17) 
+#define RCC_APB2ENR_TIM9EN			(1 << 16) 
+#define RCC_APB2ENR_SYSCFGEN		(1 << 14)
+#define RCC_APB2ENR_SPI1EN			(1 << 12)
+#define RCC_APB2ENR_SDIOEN			(1 << 11)
+#define RCC_APB2ENR_ADC3EN		  (1 << 10)  
+#define RCC_APB2ENR_ADC2EN		  (1 << 9)  
+#define RCC_APB2ENR_ADC1EN		  (1 << 8)  
+#define RCC_APB2ENR_USART6EN		(1 << 5)
+#define RCC_APB2ENR_USART1EN		(1 << 4)
+#define RCC_APB2ENR_TIM8EN			(1 << 1) 
+#define RCC_APB2ENR_TIM1EN			(1 << 0) 
+
+/* --- RCC_AHB1LPENR values ------------------------------------------------- */
+
+#define RCC_AHB1LPENR_OTGHSULPILPEN	(1 << 30) 
+#define RCC_AHB1LPENR_OTGHSLPEN			(1 << 29) 
+#define RCC_AHB1LPENR_ETHMACPTPLPEN	(1 << 28) 
+#define RCC_AHB1LPENR_ETHMACRXLPEN	(1 << 27) 
+#define RCC_AHB1LPENR_ETHMACTXLPEN	(1 << 26) 
+#define RCC_AHB1LPENR_ETHMACLPEN		(1 << 25) 
+#define RCC_AHB1LPENR_DMA2LPEN			(1 << 22) 
+#define RCC_AHB1LPENR_DMA1LPEN			(1 << 21) 
+#define RCC_AHB1LPENR_BKPSRAMLPEN		(1 << 18) 
+#define RCC_AHB1LPENR_SRAM2LPEN	  	(1 << 17) 
+#define RCC_AHB1LPENR_SRAM1LPEN 		(1 << 16) 
+#define RCC_AHB1LPENR_FLITFLPEN 		(1 << 15) 
+#define RCC_AHB1LPENR_CRCLPEN				(1 << 12) 
+#define RCC_AHB1LPENR_GPIOILPEN			(1 << 8) 
+#define RCC_AHB1LPENR_GPIOHLPEN			(1 << 7) 
+#define RCC_AHB1LPENR_GPIOGLPEN			(1 << 6) 
+#define RCC_AHB1LPENR_GPIOFLPEN			(1 << 5) 
+#define RCC_AHB1LPENR_GPIOELPEN			(1 << 4) 
+#define RCC_AHB1LPENR_GPIODLPEN			(1 << 3) 
+#define RCC_AHB1LPENR_GPIOCLPEN			(1 << 2) 
+#define RCC_AHB1LPENR_GPIOBLPEN			(1 << 1) 
+#define RCC_AHB1LPENR_GPIOALPEN			(1 << 0) 
+
+/* --- RCC_AHB2LPENR values ------------------------------------------------- */
+
+#define RCC_AHB2LPENR_OTGFSLPEN			(1 << 7) 
+#define RCC_AHB2LPENR_RNGLPEN				(1 << 6) 
+#define RCC_AHB2LPENR_HASHLPEN			(1 << 5) 
+#define RCC_AHB2LPENR_CRYPLPEN			(1 << 4) 
+#define RCC_AHB2LPENR_DCMILPEN			(1 << 0) 
+
+/* --- RCC_AHB3LPENR values ------------------------------------------------- */
+
+#define RCC_AHB3LPENR_FSMCLPEN			(1 << 0) 
+
+/* --- RCC_APB1LPENR values ------------------------------------------------- */
+
+#define RCC_APB1LPENR_DACLPEN			  (1 << 29)
+#define RCC_APB1LPENR_PWRLPEN		  	(1 << 28)
+#define RCC_APB1LPENR_CAN2LPEN			(1 << 26) 
+#define RCC_APB1LPENR_CAN1LPEN			(1 << 25) 
+#define RCC_APB1LPENR_I2C3LPEN			(1 << 23) 
+#define RCC_APB1LPENR_I2C2LPEN			(1 << 22)
+#define RCC_APB1LPENR_I2C1LPEN			(1 << 21)
+#define RCC_APB1LPENR_USART5LPEN		(1 << 20)
+#define RCC_APB1LPENR_USART4LPEN		(1 << 19)
+#define RCC_APB1LPENR_USART3LPEN		(1 << 18)
+#define RCC_APB1LPENR_USART2LPEN		(1 << 17)
+#define RCC_APB1LPENR_SPI3LPEN			(1 << 15)
+#define RCC_APB1LPENR_SPI2LPEN			(1 << 14)
+#define RCC_APB1LPENR_WWDGLPEN			(1 << 11)
+#define RCC_APB1LPENR_TIM14LPEN			(1 << 8)
+#define RCC_APB1LPENR_TIM13LPEN			(1 << 7)
+#define RCC_APB1LPENR_TIM12LPEN			(1 << 6)
+#define RCC_APB1LPENR_TIM7LPEN			(1 << 5)
+#define RCC_APB1LPENR_TIM6LPEN			(1 << 4)
+#define RCC_APB1LPENR_TIM5LPEN			(1 << 3)
+#define RCC_APB1LPENR_TIM4LPEN			(1 << 2)
+#define RCC_APB1LPENR_TIM3LPEN			(1 << 1)
+#define RCC_APB1LPENR_TIM2LPEN			(1 << 0)
+
+/* --- RCC_APB2LPENR values ------------------------------------------------- */
+
+#define RCC_APB2LPENR_TIM11LPEN			(1 << 18) 
+#define RCC_APB2LPENR_TIM10LPEN			(1 << 17) 
+#define RCC_APB2LPENR_TIM9LPEN			(1 << 16) 
+#define RCC_APB2LPENR_SYSCFGLPEN		(1 << 14)
+#define RCC_APB2LPENR_SPI1LPEN			(1 << 12)
+#define RCC_APB2LPENR_SDIOLPEN			(1 << 11)
+#define RCC_APB2LPENR_ADC3LPEN		  (1 << 10)  
+#define RCC_APB2LPENR_ADC2LPEN		  (1 << 9)  
+#define RCC_APB2LPENR_ADC1LPEN		  (1 << 8)  
+#define RCC_APB2LPENR_USART6LPEN		(1 << 5)
+#define RCC_APB2LPENR_USART1LPEN		(1 << 4)
+#define RCC_APB2LPENR_TIM8LPEN			(1 << 1) 
+#define RCC_APB2LPENR_TIM1LPEN			(1 << 0) 
+
+/* --- RCC_BDCR values ----------------------------------------------------- */
+
+#define RCC_BDCR_BDRST				(1 << 16)
+#define RCC_BDCR_RTCEN				(1 << 15)
+/* RCC_BDCR[9:8]: RTCSEL */
+#define RCC_BDCR_LSEBYP				(1 << 2)
+#define RCC_BDCR_LSERDY				(1 << 1)
+#define RCC_BDCR_LSEON				(1 << 0)
+
+/* --- RCC_CSR values ------------------------------------------------------ */
+
+#define RCC_CSR_LPWRRSTF			(1 << 31)
+#define RCC_CSR_WWDGRSTF			(1 << 30)
+#define RCC_CSR_IWDGRSTF			(1 << 29)
+#define RCC_CSR_SFTRSTF				(1 << 28)
+#define RCC_CSR_PORRSTF				(1 << 27)
+#define RCC_CSR_PINRSTF				(1 << 26)
+#define RCC_CSR_BORRSTF				(1 << 26)
+#define RCC_CSR_RMVF		  		(1 << 24)
+#define RCC_CSR_LSIRDY				(1 << 1)
+#define RCC_CSR_LSION		  		(1 << 0)
+
+/* --- RCC_SSCGR values ---------------------------------------------------- */
+
+/* PLL spread spectrum clock generation documented in Datasheet. */
+
+#define RCC_SSCGR_SSCGEN		  	(1 << 31)
+#define RCC_SSCGR_SPREADSEL	  	(1 << 30)
+/* RCC_SSCGR[27:16]: INCSTEP */
+#define RCC_SSCGR_INCSTEP_SHIFT	16
+/* RCC_SSCGR[15:0]: MODPER */
+#define RCC_SSCGR_MODPER_SHIFT	15
+
+/* --- RCC_PLLI2SCFGR values ----------------------------------------------- */
+
+/* RCC_PLLI2SCFGR[30:28]: PLLI2SR */
+#define RCC_PLLI2SCFGR_PLLI2SR_SHIFT 28
+/* RCC_PLLI2SCFGR[14:6]: PLLI2SN */
+#define RCC_PLLI2SCFGR_PLLI2SN_SHIFT 6
+
+
+#endif

From 7133e792398b87695fa73bb344c8d3d0cb08bb23 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Fri, 16 Sep 2011 23:14:07 -0700
Subject: [PATCH 37/51] Change default prefix in Makefiles to arm-none-eabi for
 compatability with summon toolchain out the box.

---
 examples/stm32f2/Makefile.include | 2 +-
 lib/stm32f2/Makefile              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/stm32f2/Makefile.include b/examples/stm32f2/Makefile.include
index 6ec9f65b..9cec6e7d 100644
--- a/examples/stm32f2/Makefile.include
+++ b/examples/stm32f2/Makefile.include
@@ -20,7 +20,7 @@
 ##
 
 PREFIX	?= arm-none-eabi
-#PREFIX		?= arm-elf
+# PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
diff --git a/lib/stm32f2/Makefile b/lib/stm32f2/Makefile
index cd50c4b8..5da64ab3 100644
--- a/lib/stm32f2/Makefile
+++ b/lib/stm32f2/Makefile
@@ -19,8 +19,8 @@
 
 LIBNAME		= libopencm3_stm32f2
 
-# PREFIX	?= arm-none-eabi
-PREFIX		?= arm-elf
+PREFIX	?= arm-none-eabi
+# PREFIX		?= arm-elf
 CC		= $(PREFIX)-gcc
 AR		= $(PREFIX)-ar
 CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
@@ -28,7 +28,7 @@ CFLAGS		= -Os -g -Wall -Wextra -I../../include -fno-common \
 		  -ffunction-sections -fdata-sections -MD -DSTM32F2
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
-OBJS		= vector.o gpio.o systick.o i2c.o spi.o nvic.o
+OBJS		= vector.o gpio.o systick.o i2c.o spi.o nvic.o usart.o
 
 #VPATH += ../usb
 VPATH += ../stm32_common

From d1272acaad8bb7dc41b81bd0c7a9728b7d308422 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 22 Sep 2011 13:52:43 -0700
Subject: [PATCH 38/51] Initial move of USART code to common, still needs some
 work.

---
 include/libopencm3/stm32/usart.h      |  2 +-
 lib/{stm32f1 => stm32_common}/usart.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)
 rename lib/{stm32f1 => stm32_common}/usart.c (94%)

diff --git a/include/libopencm3/stm32/usart.h b/include/libopencm3/stm32/usart.h
index df6bc089..51b96f24 100644
--- a/include/libopencm3/stm32/usart.h
+++ b/include/libopencm3/stm32/usart.h
@@ -294,7 +294,7 @@
 
 /* --- Function prototypes ------------------------------------------------- */
 
-void usart_set_baudrate(u32 usart, u32 baud);
+void usart_set_baudrate(u32 usart, u32 baud, u32 clock);
 void usart_set_databits(u32 usart, u32 bits);
 void usart_set_stopbits(u32 usart, u32 stopbits);
 void usart_set_parity(u32 usart, u32 parity);
diff --git a/lib/stm32f1/usart.c b/lib/stm32_common/usart.c
similarity index 94%
rename from lib/stm32f1/usart.c
rename to lib/stm32_common/usart.c
index 73e450b2..026af3af 100644
--- a/lib/stm32f1/usart.c
+++ b/lib/stm32_common/usart.c
@@ -17,17 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f1/rcc.h>
-
 #include <libopencm3/stm32/usart.h>
 
-void usart_set_baudrate(u32 usart, u32 baud)
+void usart_set_baudrate(u32 usart, u32 baud, u32 clock)
 {
-	u32 clock = rcc_ppre1_frequency;
+	//u32 clock = rcc_ppre1_frequency;
 
-	if (usart == USART1) {
-		clock = rcc_ppre2_frequency;
-	}
+	//if (usart == USART1) {
+	//	clock = rcc_ppre2_frequency;
+	//}
 
 	/* yes it is as simple as that. The reference manual is
 	 * talking about factional calculation but it seems to be only

From fae6f83bb96bbe0b69b433d42253081574bcabc4 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 22 Sep 2011 13:53:10 -0700
Subject: [PATCH 39/51] Adding jobygps usart example.

---
 .../stm32f2/jobygps/usart_printf/Makefile     |  23 ++++
 .../jobygps/usart_printf/usart_printf.c       | 110 ++++++++++++++++++
 .../jobygps/usart_printf/usart_printf.ld      |  31 +++++
 3 files changed, 164 insertions(+)
 create mode 100644 examples/stm32f2/jobygps/usart_printf/Makefile
 create mode 100644 examples/stm32f2/jobygps/usart_printf/usart_printf.c
 create mode 100644 examples/stm32f2/jobygps/usart_printf/usart_printf.ld

diff --git a/examples/stm32f2/jobygps/usart_printf/Makefile b/examples/stm32f2/jobygps/usart_printf/Makefile
new file mode 100644
index 00000000..fb262087
--- /dev/null
+++ b/examples/stm32f2/jobygps/usart_printf/Makefile
@@ -0,0 +1,23 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+BINARY = usart_printf
+
+include ../../Makefile.include
+
diff --git a/examples/stm32f2/jobygps/usart_printf/usart_printf.c b/examples/stm32f2/jobygps/usart_printf/usart_printf.c
new file mode 100644
index 00000000..b03b842e
--- /dev/null
+++ b/examples/stm32f2/jobygps/usart_printf/usart_printf.c
@@ -0,0 +1,110 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>,
+ *               2011 Piotr Esden-Tempski <piotr@esden.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/f2/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/f2/rcc.h>
+
+#include <stdio.h>
+#include <errno.h>
+
+void clock_setup(void)
+{
+	//rcc_clock_setup_in_hse_8mhz_out_72mhz();
+
+	/* Enable GPIOA clock (for LED GPIOs). */
+	//rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+
+	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
+	//rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
+//				RCC_APB2ENR_AFIOEN |
+//				RCC_APB2ENR_USART1EN);
+  RCC_APB2ENR |= RCC_APB2ENR_USART1EN;
+	RCC_AHB1ENR |= RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOAEN;
+}
+
+void usart_setup(void)
+{
+	//gpio_mode_setup(GPIOA, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO9);
+	GPIO_MODER(GPIOA) |= GPIO_MODE(9, GPIO_MODE_AF);
+	gpio_set_af(GPIOA, GPIO_AF7, GPIO9|GPIO10);
+
+	/* Setup UART parameters. */
+	usart_set_baudrate(USART1, 9600, 16000000);
+	usart_set_databits(USART1, 8);
+	usart_set_stopbits(USART1, USART_STOPBITS_1);
+	usart_set_parity(USART1, USART_PARITY_NONE);
+	usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE);
+	usart_set_mode(USART1, USART_MODE_TX);
+
+	/* Finally enable the USART. */
+	usart_enable(USART1);
+}
+
+void gpio_setup(void)
+{
+	gpio_set(GPIOC, GPIO3);
+
+	/* Setup GPIO6 and 7 (in GPIO port A) for led use. */
+	gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT,
+		      GPIO_MODE_OUTPUT, GPIO3);
+}
+
+int _write (int file, char *ptr, int len)
+{
+        int i;
+
+	if (file == 1) {
+		for (i = 0; i < len; i++){
+			usart_send_blocking(USART1, ptr[i]);
+		}
+
+		return i;
+	}
+
+        errno = EIO;
+        return -1;
+}
+
+int main(void)
+{
+	int counter = 0;
+	float fcounter = 0.0;
+	double dcounter = 0.0;
+
+	clock_setup();
+	gpio_setup();
+	usart_setup();
+
+	/*
+	 * Write Hello World an integer, float and double all over
+	 * again while incrementing the numbers.
+	 */
+	while (1) {
+		gpio_toggle(GPIOC, GPIO3);
+		printf("Hello World! %i %f %f\r\n", counter, fcounter, dcounter);
+		counter++;
+		fcounter+=0.01;
+		dcounter+=0.01;
+	}
+
+	return 0;
+}
diff --git a/examples/stm32f2/jobygps/usart_printf/usart_printf.ld b/examples/stm32f2/jobygps/usart_printf/usart_printf.ld
new file mode 100644
index 00000000..78997732
--- /dev/null
+++ b/examples/stm32f2/jobygps/usart_printf/usart_printf.ld
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Linker script for Open-BLDC (STM32F103CBT6, 128K flash, 20K RAM). */
+
+/* Define memory regions. */
+MEMORY
+{
+	rom (rx) : ORIGIN = 0x08000000, LENGTH = 128K
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
+}
+
+/* Include the common ld script. */
+INCLUDE libopencm3_stm32.ld
+

From 1a555c9646ddfe2dd6ff67fbeb8d0324c129786f Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 22 Sep 2011 13:53:30 -0700
Subject: [PATCH 40/51] OpenOCD config file for JobyGPS.

---
 examples/stm32f2/jobygps/jobygps.cfg | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 examples/stm32f2/jobygps/jobygps.cfg

diff --git a/examples/stm32f2/jobygps/jobygps.cfg b/examples/stm32f2/jobygps/jobygps.cfg
new file mode 100644
index 00000000..7ca449e2
--- /dev/null
+++ b/examples/stm32f2/jobygps/jobygps.cfg
@@ -0,0 +1,3 @@
+reset_config srst_only srst_push_pull
+source [find target/stm32f2x.cfg]
+

From 53f1c75c53f856af7a46cebc3e68a68c0a89036d Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 22 Sep 2011 14:23:25 -0700
Subject: [PATCH 41/51] Fixed bug in F2 GPIO code.

---
 lib/stm32f2/gpio.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/lib/stm32f2/gpio.c b/lib/stm32f2/gpio.c
index 23306286..abb08c0e 100644
--- a/lib/stm32f2/gpio.c
+++ b/lib/stm32f2/gpio.c
@@ -17,29 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * Basic GPIO handling API.
- *
- * Examples:
- *  gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
- *                GPIO_CNF_OUTPUT_PUSHPULL, GPIO12);
- *  gpio_set(GPIOB, GPIO4);
- *  gpio_clear(GPIOG, GPIO2 | GPIO9);
- *  gpio_get(GPIOC, GPIO1);
- *  gpio_toggle(GPIOA, GPIO7 | GPIO8);
- *  reg16 = gpio_port_read(GPIOD);
- *  gpio_port_write(GPIOF, 0xc8fe);
- *
- * TODO:
- *  - GPIO remapping support
- */
-
 #include <libopencm3/stm32/f2/gpio.h>
 
 void gpio_mode_setup(u32 gpioport, u8 mode, u8 pull_up_down, u16 gpios)
 {
 	u16 i;
-	u16 moder, pupd;
+	u32 moder, pupd;
 
 	/*
 	 * We want to set the config only for the pins mentioned in gpios,

From c4c9d6ca112b104301152fcdea3a487ed0e42bb9 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Thu, 22 Sep 2011 14:23:49 -0700
Subject: [PATCH 42/51] Updating the usart example in jobygps to use fixed gpio
 code.

---
 examples/stm32f2/jobygps/usart_printf/usart_printf.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/stm32f2/jobygps/usart_printf/usart_printf.c b/examples/stm32f2/jobygps/usart_printf/usart_printf.c
index b03b842e..f5a4cf58 100644
--- a/examples/stm32f2/jobygps/usart_printf/usart_printf.c
+++ b/examples/stm32f2/jobygps/usart_printf/usart_printf.c
@@ -43,8 +43,7 @@ void clock_setup(void)
 
 void usart_setup(void)
 {
-	//gpio_mode_setup(GPIOA, GPIO_MODE_OUTPUT, GPIO_PUPD_NONE, GPIO9);
-	GPIO_MODER(GPIOA) |= GPIO_MODE(9, GPIO_MODE_AF);
+	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO9);
 	gpio_set_af(GPIOA, GPIO_AF7, GPIO9|GPIO10);
 
 	/* Setup UART parameters. */

From ef8f8d831e83fcba4573404b588142853dd226fb Mon Sep 17 00:00:00 2001
From: Henry Hallam <hhallam@jobyenergy.com>
Date: Thu, 22 Sep 2011 16:04:42 -0700
Subject: [PATCH 43/51] SPI test (untested)

---
 examples/stm32f2/jobygps/spi_test/Makefile    |  23 ++++
 examples/stm32f2/jobygps/spi_test/spi_test.c  | 122 ++++++++++++++++++
 examples/stm32f2/jobygps/spi_test/spi_test.ld |  31 +++++
 3 files changed, 176 insertions(+)
 create mode 100644 examples/stm32f2/jobygps/spi_test/Makefile
 create mode 100644 examples/stm32f2/jobygps/spi_test/spi_test.c
 create mode 100644 examples/stm32f2/jobygps/spi_test/spi_test.ld

diff --git a/examples/stm32f2/jobygps/spi_test/Makefile b/examples/stm32f2/jobygps/spi_test/Makefile
new file mode 100644
index 00000000..de4c338c
--- /dev/null
+++ b/examples/stm32f2/jobygps/spi_test/Makefile
@@ -0,0 +1,23 @@
+##
+## This file is part of the libopencm3 project.
+##
+## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
+
+BINARY = spi_test
+
+include ../../Makefile.include
+
diff --git a/examples/stm32f2/jobygps/spi_test/spi_test.c b/examples/stm32f2/jobygps/spi_test/spi_test.c
new file mode 100644
index 00000000..2145165b
--- /dev/null
+++ b/examples/stm32f2/jobygps/spi_test/spi_test.c
@@ -0,0 +1,122 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>,
+ *               2011 Piotr Esden-Tempski <piotr@esden.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/spi.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/f2/gpio.h>
+#include <libopencm3/stm32/f2/rcc.h>
+
+#include <stdio.h>
+#include <errno.h>
+
+void clock_setup(void)
+{
+	//rcc_clock_setup_in_hse_8mhz_out_72mhz();
+
+	/* Enable GPIOA clock (for LED GPIOs). */
+	//rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
+
+	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
+	//rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
+//				RCC_APB2ENR_AFIOEN |
+//				RCC_APB2ENR_USART1EN);
+  RCC_APB1ENR |= RCC_APB1ENR_SPI2EN;
+  RCC_APB2ENR |= RCC_APB2ENR_USART1EN;
+	RCC_AHB1ENR |= RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOAEN;   // PORT B not enabled...
+	
+}
+
+void spi_setup(void)
+{
+	gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO12 | GPIO13 | GPIO14 | GPIO15);
+
+	/* Setup SPI parameters. */
+  spi_init_master(SPI2, SPI_CR1_BAUDRATE_FPCLK_DIV_256, SPI_CR1_CPOL, SPI_CR1_CPHA, SPI_CR1_DFF_8BIT, SPI_CR1_MSBFIRST);
+
+	/* Finally enable the SPI. */
+	spi_enable(SPI2);
+}
+
+void usart_setup(void)
+{
+	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO9);
+	//GPIO_MODER(GPIOA) |= GPIO_MODE(9, GPIO_MODE_AF);
+	//gpio_set_af(GPIOA, GPIO_AF7, GPIO9|GPIO10);
+
+	/* Setup UART parameters. */
+	usart_set_baudrate(USART1, 9600, 16000000);
+	usart_set_databits(USART1, 8);
+	usart_set_stopbits(USART1, USART_STOPBITS_1);
+	usart_set_parity(USART1, USART_PARITY_NONE);
+	usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE);
+	usart_set_mode(USART1, USART_MODE_TX);
+
+	/* Finally enable the USART. */
+	usart_enable(USART1);
+}
+
+void gpio_setup(void)
+{
+	gpio_set(GPIOC, GPIO3);
+
+	/* Setup GPIO6 and 7 (in GPIO port A) for led use. */
+	gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT,
+		      GPIO_MODE_OUTPUT, GPIO3);
+}
+
+int _write (int file, char *ptr, int len)
+{
+        int i;
+
+	if (file == 1) {
+		for (i = 0; i < len; i++){
+			usart_send_blocking(USART1, ptr[i]);
+		}
+
+		return i;
+	}
+
+        errno = EIO;
+        return -1;
+}
+
+int main(void)
+{
+	int counter = 0;
+
+	clock_setup();
+	gpio_setup();
+	usart_setup();
+  spi_setup();
+
+	/*
+	 * Write Hello World an integer, float and double all over
+	 * again while incrementing the numbers.
+	 */
+	while (1) {
+		gpio_toggle(GPIOC, GPIO3);
+		printf("Hello World! %i\r\n", counter);
+		counter++;
+    spi_send(SPI2,(u8)counter);
+	}
+
+	return 0;
+}
diff --git a/examples/stm32f2/jobygps/spi_test/spi_test.ld b/examples/stm32f2/jobygps/spi_test/spi_test.ld
new file mode 100644
index 00000000..78997732
--- /dev/null
+++ b/examples/stm32f2/jobygps/spi_test/spi_test.ld
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Linker script for Open-BLDC (STM32F103CBT6, 128K flash, 20K RAM). */
+
+/* Define memory regions. */
+MEMORY
+{
+	rom (rx) : ORIGIN = 0x08000000, LENGTH = 128K
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
+}
+
+/* Include the common ld script. */
+INCLUDE libopencm3_stm32.ld
+

From f0c153598d5eb8373770297e71732f8fcef4f8ef Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Fri, 23 Sep 2011 13:04:11 -0700
Subject: [PATCH 44/51] SPI test now working on F2!

---
 examples/stm32f2/jobygps/spi_test/spi_test.c  | 49 ++++++++-----------
 examples/stm32f2/jobygps/spi_test/spi_test.ld |  8 +--
 2 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/examples/stm32f2/jobygps/spi_test/spi_test.c b/examples/stm32f2/jobygps/spi_test/spi_test.c
index 2145165b..b45789ca 100644
--- a/examples/stm32f2/jobygps/spi_test/spi_test.c
+++ b/examples/stm32f2/jobygps/spi_test/spi_test.c
@@ -1,8 +1,8 @@
 /*
  * This file is part of the libopencm3 project.
  *
- * Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>,
- *               2011 Piotr Esden-Tempski <piotr@esden.net>
+ * Copyright (C) 2011 Fergus Noble <fergusnoble@gmail.com>
+ * Copyright (C) 2011 Henry Hallam <henry@pericynthion.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,27 +29,21 @@
 
 void clock_setup(void)
 {
-	//rcc_clock_setup_in_hse_8mhz_out_72mhz();
-
-	/* Enable GPIOA clock (for LED GPIOs). */
-	//rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
-
-	/* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */
-	//rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN |
-//				RCC_APB2ENR_AFIOEN |
-//				RCC_APB2ENR_USART1EN);
   RCC_APB1ENR |= RCC_APB1ENR_SPI2EN;
   RCC_APB2ENR |= RCC_APB2ENR_USART1EN;
-	RCC_AHB1ENR |= RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOAEN;   // PORT B not enabled...
+	RCC_AHB1ENR |= RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOAEN | RCC_AHB1ENR_GPIOBEN;
 	
 }
 
 void spi_setup(void)
 {
-	gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO12 | GPIO13 | GPIO14 | GPIO15);
+	gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO13 | GPIO14 | GPIO15);
+	gpio_set_af(GPIOB, GPIO_AF5, GPIO13 | GPIO14 | GPIO15);
 
 	/* Setup SPI parameters. */
-  spi_init_master(SPI2, SPI_CR1_BAUDRATE_FPCLK_DIV_256, SPI_CR1_CPOL, SPI_CR1_CPHA, SPI_CR1_DFF_8BIT, SPI_CR1_MSBFIRST);
+  spi_init_master(SPI2, SPI_CR1_BAUDRATE_FPCLK_DIV_256, SPI_CR1_CPOL, \
+      SPI_CR1_CPHA, SPI_CR1_DFF_8BIT, SPI_CR1_MSBFIRST);
+  spi_enable_ss_output(SPI2); /* Required, see 25.3.1 section about NSS */
 
 	/* Finally enable the SPI. */
 	spi_enable(SPI2);
@@ -58,8 +52,7 @@ void spi_setup(void)
 void usart_setup(void)
 {
 	gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO9);
-	//GPIO_MODER(GPIOA) |= GPIO_MODE(9, GPIO_MODE_AF);
-	//gpio_set_af(GPIOA, GPIO_AF7, GPIO9|GPIO10);
+	gpio_set_af(GPIOA, GPIO_AF7, GPIO9|GPIO10);
 
 	/* Setup UART parameters. */
 	usart_set_baudrate(USART1, 9600, 16000000);
@@ -77,46 +70,44 @@ void gpio_setup(void)
 {
 	gpio_set(GPIOC, GPIO3);
 
-	/* Setup GPIO6 and 7 (in GPIO port A) for led use. */
+	/* Setup GPIO3 (in GPIO port C) for led use. */
 	gpio_mode_setup(GPIOC, GPIO_MODE_OUTPUT,
 		      GPIO_MODE_OUTPUT, GPIO3);
 }
 
 int _write (int file, char *ptr, int len)
 {
-        int i;
+  int i;
 
 	if (file == 1) {
 		for (i = 0; i < len; i++){
 			usart_send_blocking(USART1, ptr[i]);
 		}
-
 		return i;
 	}
-
-        errno = EIO;
-        return -1;
+  errno = EIO;
+  return -1;
 }
 
 int main(void)
 {
 	int counter = 0;
+  volatile u16 dummy;
 
 	clock_setup();
 	gpio_setup();
 	usart_setup();
   spi_setup();
 
-	/*
-	 * Write Hello World an integer, float and double all over
-	 * again while incrementing the numbers.
-	 */
-	while (1) {
-		gpio_toggle(GPIOC, GPIO3);
-		printf("Hello World! %i\r\n", counter);
+	while (1)
+  {
 		counter++;
+	  printf("Hello, world! %i\r\n", counter);
+    dummy = spi_read(SPI2); /* Stops RX buff overflow, but probably not needed */
     spi_send(SPI2,(u8)counter);
+	  gpio_toggle(GPIOC, GPIO3);
 	}
 
+  while(1);
 	return 0;
 }
diff --git a/examples/stm32f2/jobygps/spi_test/spi_test.ld b/examples/stm32f2/jobygps/spi_test/spi_test.ld
index 78997732..cfe9ab7b 100644
--- a/examples/stm32f2/jobygps/spi_test/spi_test.ld
+++ b/examples/stm32f2/jobygps/spi_test/spi_test.ld
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Linker script for Open-BLDC (STM32F103CBT6, 128K flash, 20K RAM). */
+/* Linker script for Olimex STM32-H103 (STM32F103RBT6, 128K flash, 20K RAM). */
 
 /* Define memory regions. */
 MEMORY
 {
-	rom (rx) : ORIGIN = 0x08000000, LENGTH = 128K
-	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
+	rom (rx) : ORIGIN = 0x08000000, LENGTH = 256K
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f2.ld
 

From e7f909c50206f7a4cc467fa55633c70bbd384491 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Fri, 23 Sep 2011 13:04:54 -0700
Subject: [PATCH 45/51] Minor fixes to the SPI code, mainly you should check
 that the TX buffer is empty before rather than after sending.

---
 lib/stm32_common/spi.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/stm32_common/spi.c b/lib/stm32_common/spi.c
index 733a1bc4..7fb87115 100644
--- a/lib/stm32_common/spi.c
+++ b/lib/stm32_common/spi.c
@@ -54,11 +54,7 @@ int spi_init_master(u32 spi, u32 br, u32 cpol, u32 cpha, u32 dff, u32 lsbfirst)
 /* TODO: Error handling? */
 void spi_enable(u32 spi)
 {
-	u32 reg32;
-
-	reg32 = SPI_CR1(spi);
-	reg32 |= SPI_CR1_SPE;		/* Enable SPI. */
-	SPI_CR1(spi) = reg32;
+	SPI_CR1(spi) |= SPI_CR1_SPE; /* Enable SPI. */
 }
 
 /* TODO: Error handling? */
@@ -80,13 +76,11 @@ void spi_write(u32 spi, u16 data)
 
 void spi_send(u32 spi, u16 data)
 {
+	/* wait for transfer finished */
+  while (SPI_SR(spi) & SPI_SR_BSY );
+  
 	/* Write data (8 or 16 bits, depending on DFF) into DR. */
 	SPI_DR(spi) = data;
-	
-	/* wait for transfer finished */
-        while (SPI_SR(spi) & SPI_SR_BSY )
-        {
-        }
 }
 
 u16 spi_read(u32 spi)

From e772992f4c56d79581e62607c27609e4eeaaae7e Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Fri, 23 Sep 2011 13:05:12 -0700
Subject: [PATCH 46/51] Some more silly bugs in GPIO fixed for F2.

---
 lib/stm32f2/gpio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/stm32f2/gpio.c b/lib/stm32f2/gpio.c
index abb08c0e..6e1ef08a 100644
--- a/lib/stm32f2/gpio.c
+++ b/lib/stm32f2/gpio.c
@@ -49,7 +49,7 @@ void gpio_mode_setup(u32 gpioport, u8 mode, u8 pull_up_down, u16 gpios)
 void gpio_set_output_options(u32 gpioport, u8 otype, u8 speed, u16 gpios)
 {
 	u16 i;
-	u16 ospeedr;
+	u32 ospeedr;
 
 	if (otype == 0x1)
 		GPIO_OTYPER(gpioport) |= gpios;
@@ -71,7 +71,7 @@ void gpio_set_output_options(u32 gpioport, u8 otype, u8 speed, u16 gpios)
 void gpio_set_af(u32 gpioport, u8 alt_func_num, u16 gpios)
 {
 	u16 i;
-	u16 afrl, afrh;
+	u32 afrl, afrh;
 
 	afrl = GPIO_AFRL(gpioport);
 	afrh = GPIO_AFRH(gpioport);

From 84b9f859416bb32ba7cf5f19b930445adb2aa41d Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Mon, 26 Sep 2011 14:21:42 -0700
Subject: [PATCH 47/51] Moving a couple more headers to stm common.

---
 include/libopencm3/stm32/{f1 => }/otg_fs.h | 0
 include/libopencm3/stm32/{f1 => }/tools.h  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename include/libopencm3/stm32/{f1 => }/otg_fs.h (100%)
 rename include/libopencm3/stm32/{f1 => }/tools.h (100%)

diff --git a/include/libopencm3/stm32/f1/otg_fs.h b/include/libopencm3/stm32/otg_fs.h
similarity index 100%
rename from include/libopencm3/stm32/f1/otg_fs.h
rename to include/libopencm3/stm32/otg_fs.h
diff --git a/include/libopencm3/stm32/f1/tools.h b/include/libopencm3/stm32/tools.h
similarity index 100%
rename from include/libopencm3/stm32/f1/tools.h
rename to include/libopencm3/stm32/tools.h

From 7518bc83c1b5b2f4f363ec43478b4d1320e0a8ef Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Tue, 27 Sep 2011 17:18:15 -0700
Subject: [PATCH 48/51] Fixing some header references

---
 lib/stm32f1/scb.c  | 2 +-
 lib/usb/usb_f103.c | 2 +-
 lib/usb/usb_f107.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/stm32f1/scb.c b/lib/stm32f1/scb.c
index dfee6c37..54c57764 100644
--- a/lib/stm32f1/scb.c
+++ b/lib/stm32f1/scb.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/scb.h>
 
 void scb_reset_core(void)
 {
diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c
index 594d3c6b..274d4e9a 100644
--- a/lib/usb/usb_f103.c
+++ b/lib/usb/usb_f103.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/cm3/common.h>
 #include <libopencm3/stm32/tools.h>
 #include <libopencm3/stm32/usb.h>
diff --git a/lib/usb/usb_f107.c b/lib/usb/usb_f107.c
index 134b728b..65c76b49 100644
--- a/lib/usb/usb_f107.c
+++ b/lib/usb/usb_f107.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/cm3/common.h>
 #include <libopencm3/stm32/tools.h>
 #include <libopencm3/stm32/otg_fs.h>

From 14dcda91b06c517d5a7e5485ceac040d72978a31 Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Tue, 27 Sep 2011 17:19:24 -0700
Subject: [PATCH 49/51] Fixing some more header references

---
 lib/usb/usb_f103.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c
index 274d4e9a..ea173d78 100644
--- a/lib/usb/usb_f103.c
+++ b/lib/usb/usb_f103.c
@@ -20,7 +20,7 @@
 #include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/cm3/common.h>
 #include <libopencm3/stm32/tools.h>
-#include <libopencm3/stm32/usb.h>
+#include <libopencm3/stm32/f1/usb.h>
 #include <libopencm3/usb/usbd.h>
 #include "usb_private.h"
 

From 878c0948719436f36862feef3908ed0c78cccbdd Mon Sep 17 00:00:00 2001
From: Fergus Noble <fergusnoble@gmail.com>
Date: Tue, 4 Oct 2011 16:06:01 -0700
Subject: [PATCH 50/51] Added alternative function for doing an SPI transfer.

---
 include/libopencm3/stm32/spi.h |  1 +
 lib/stm32_common/spi.c         | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/include/libopencm3/stm32/spi.h b/include/libopencm3/stm32/spi.h
index 3cadaf8c..30366579 100644
--- a/include/libopencm3/stm32/spi.h
+++ b/include/libopencm3/stm32/spi.h
@@ -290,6 +290,7 @@ void spi_disable(u32 spi);
 void spi_write(u32 spi, u16 data);
 void spi_send(u32 spi, u16 data);
 u16 spi_read(u32 spi);
+u16 spi_xfer(u32 spi, u16 data);
 void spi_set_bidirectional_mode(u32 spi);
 void spi_set_unidirectional_mode(u32 spi);
 void spi_set_bidirectional_receive_only_mode(u32 spi);
diff --git a/lib/stm32_common/spi.c b/lib/stm32_common/spi.c
index 7fb87115..71bb846c 100644
--- a/lib/stm32_common/spi.c
+++ b/lib/stm32_common/spi.c
@@ -77,7 +77,7 @@ void spi_write(u32 spi, u16 data)
 void spi_send(u32 spi, u16 data)
 {
 	/* wait for transfer finished */
-  while (SPI_SR(spi) & SPI_SR_BSY );
+  while (!(SPI_SR(spi) & SPI_SR_TXE ));
   
 	/* Write data (8 or 16 bits, depending on DFF) into DR. */
 	SPI_DR(spi) = data;
@@ -85,6 +85,20 @@ void spi_send(u32 spi, u16 data)
 
 u16 spi_read(u32 spi)
 {
+	/* wait for transfer finished */
+  while (!(SPI_SR(spi) & SPI_SR_RXNE ));
+
+	/* Read the data (8 or 16 bits, depending on DFF bit) from DR. */
+	return SPI_DR(spi);
+}
+
+u16 spi_xfer(u32 spi, u16 data)
+{
+  spi_write(spi, data);
+
+	/* wait for transfer finished */
+  while (!(SPI_SR(spi) & SPI_SR_RXNE ));
+
 	/* Read the data (8 or 16 bits, depending on DFF bit) from DR. */
 	return SPI_DR(spi);
 }

From 8ceeb99902786041184800248eca4d7f3741d9bf Mon Sep 17 00:00:00 2001
From: Stephen Caudle <github@doceme.com>
Date: Wed, 12 Oct 2011 23:58:27 -0400
Subject: [PATCH 51/51] Fix stm32f1 filenames and path

---
 examples/stm32f1/Makefile.include                | 16 ++++++++--------
 examples/stm32f1/lisa-m/fancyblink/fancyblink.c  |  4 ++--
 examples/stm32f1/lisa-m/fancyblink/fancyblink.ld |  2 +-
 examples/stm32f1/lisa-m/usb_dfu/usbdfu.c         |  8 ++++----
 examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld        |  2 +-
 examples/stm32f1/lisa-m/usb_hid/usbhid.c         |  6 +++---
 examples/stm32f1/lisa-m/usb_hid/usbhid.ld        |  2 +-
 examples/stm32f1/mb525/fancyblink/fancyblink.c   |  4 ++--
 examples/stm32f1/mb525/fancyblink/fancyblink.ld  |  2 +-
 examples/stm32f1/mb525/pwmleds/pwmleds.c         |  4 ++--
 examples/stm32f1/mb525/pwmleds/pwmleds.ld        |  2 +-
 examples/stm32f1/obldc/can/can.c                 |  6 +++---
 examples/stm32f1/obldc/can/can.ld                |  2 +-
 examples/stm32f1/obldc/led/led.c                 |  4 ++--
 examples/stm32f1/obldc/led/led.ld                |  2 +-
 examples/stm32f1/obldc/pwmleds/pwmleds.c         |  4 ++--
 examples/stm32f1/obldc/pwmleds/pwmleds.ld        |  2 +-
 examples/stm32f1/obldc/systick/systick.c         |  6 +++---
 examples/stm32f1/obldc/systick/systick.ld        |  2 +-
 examples/stm32f1/obldc/usart/usart.c             |  6 +++---
 examples/stm32f1/obldc/usart/usart.ld            |  2 +-
 examples/stm32f1/obldc/usart_irq/usart_irq.c     |  6 +++---
 examples/stm32f1/obldc/usart_irq/usart_irq.ld    |  2 +-
 .../stm32f1/other/adc_temperature_sensor/adc.c   | 10 +++++-----
 .../stm32f1/other/adc_temperature_sensor/adc.ld  |  2 +-
 examples/stm32f1/other/dma_mem2mem/dma.c         | 10 +++++-----
 examples/stm32f1/other/dma_mem2mem/dma.ld        |  2 +-
 examples/stm32f1/other/dogm128/dogm128.h         |  2 +-
 examples/stm32f1/other/dogm128/main.c            |  6 +++---
 examples/stm32f1/other/dogm128/main.ld           |  2 +-
 .../other/i2c_stts75_sensor/i2c_stts75_sensor.c  |  8 ++++----
 .../other/i2c_stts75_sensor/i2c_stts75_sensor.ld |  2 +-
 examples/stm32f1/other/rtc/rtc.c                 |  8 ++++----
 examples/stm32f1/other/rtc/rtc.ld                |  2 +-
 examples/stm32f1/other/systick/systick.c         |  6 +++---
 examples/stm32f1/other/systick/systick.ld        |  2 +-
 examples/stm32f1/other/timer_interrupt/timer.c   |  6 +++---
 examples/stm32f1/other/timer_interrupt/timer.ld  |  2 +-
 examples/stm32f1/other/usb_cdcacm/cdcacm.c       |  4 ++--
 examples/stm32f1/other/usb_cdcacm/cdcacm.ld      |  2 +-
 examples/stm32f1/other/usb_dfu/usbdfu.c          |  8 ++++----
 examples/stm32f1/other/usb_dfu/usbdfu.ld         |  2 +-
 examples/stm32f1/other/usb_hid/usbhid.c          |  6 +++---
 examples/stm32f1/other/usb_hid/usbhid.ld         |  2 +-
 examples/stm32f1/stm32-discovery/button/button.c |  4 ++--
 .../stm32f1/stm32-discovery/button/button.ld     |  2 +-
 .../stm32-discovery/fancyblink/fancyblink.c      |  4 ++--
 .../stm32-discovery/fancyblink/fancyblink.ld     |  2 +-
 .../stm32-discovery/miniblink/miniblink.c        |  4 ++--
 .../stm32-discovery/miniblink/miniblink.ld       |  2 +-
 examples/stm32f1/stm32-discovery/rtc/rtc.c       |  6 +++---
 examples/stm32f1/stm32-discovery/rtc/rtc.ld      |  2 +-
 examples/stm32f1/stm32-discovery/usart/usart.c   |  4 ++--
 examples/stm32f1/stm32-discovery/usart/usart.ld  |  2 +-
 examples/stm32f1/stm32-h103/button/button.c      |  4 ++--
 examples/stm32f1/stm32-h103/button/button.ld     |  2 +-
 .../stm32f1/stm32-h103/exti_both/exti_both.c     |  4 ++--
 .../stm32f1/stm32-h103/exti_both/exti_both.ld    |  2 +-
 .../exti_rising_falling/exti_rising_falling.c    |  4 ++--
 .../exti_rising_falling/exti_rising_falling.ld   |  2 +-
 .../stm32f1/stm32-h103/fancyblink/fancyblink.c   |  4 ++--
 .../stm32f1/stm32-h103/fancyblink/fancyblink.ld  |  2 +-
 .../stm32f1/stm32-h103/led_stripe/led_stripe.c   |  4 ++--
 .../stm32f1/stm32-h103/led_stripe/led_stripe.ld  |  2 +-
 .../stm32f1/stm32-h103/miniblink/miniblink.c     |  4 ++--
 .../stm32f1/stm32-h103/miniblink/miniblink.ld    |  2 +-
 .../stm32f1/stm32-h103/pwm_6step/pwm_6step.c     |  6 +++---
 .../stm32f1/stm32-h103/pwm_6step/pwm_6step.ld    |  2 +-
 examples/stm32f1/stm32-h103/spi/spi.c            |  2 +-
 examples/stm32f1/stm32-h103/spi/spi.ld           |  2 +-
 examples/stm32f1/stm32-h103/timer/timer.c        |  6 +++---
 examples/stm32f1/stm32-h103/timer/timer.ld       |  2 +-
 examples/stm32f1/stm32-h103/traceswo/traceswo.c  |  4 ++--
 examples/stm32f1/stm32-h103/traceswo/traceswo.ld |  2 +-
 examples/stm32f1/stm32-h103/usart/usart.c        | 10 +++++-----
 examples/stm32f1/stm32-h103/usart/usart.ld       |  2 +-
 .../stm32f1/stm32-h103/usart_irq/usart_irq.c     |  6 +++---
 .../stm32f1/stm32-h103/usart_irq/usart_irq.ld    |  2 +-
 .../usart_irq_printf/usart_irq_printf.c          |  6 +++---
 .../usart_irq_printf/usart_irq_printf.ld         |  2 +-
 .../stm32-h103/usart_printf/usart_printf.c       |  6 +++---
 .../stm32-h103/usart_printf/usart_printf.ld      |  2 +-
 examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c  |  4 ++--
 examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld |  2 +-
 examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c     |  8 ++++----
 examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld    |  2 +-
 examples/stm32f1/stm32-h103/usb_hid/usbhid.c     |  6 +++---
 examples/stm32f1/stm32-h103/usb_hid/usbhid.ld    |  2 +-
 examples/stm32f1/stm32-h103/usb_iap/usbiap.c     |  8 ++++----
 examples/stm32f1/stm32-h103/usb_iap/usbiap.ld    |  2 +-
 .../stm32f1/stm32-h107/fancyblink/fancyblink.c   |  4 ++--
 .../stm32f1/stm32-h107/fancyblink/fancyblink.ld  |  2 +-
 .../stm32f1/stm32-h107/usb_simple/usb_simple.c   |  4 ++--
 .../stm32f1/stm32-h107/usb_simple/usb_simple.ld  |  2 +-
 .../stm32f2/jobygps/usart_printf/usart_printf.ld |  2 +-
 95 files changed, 184 insertions(+), 184 deletions(-)

diff --git a/examples/stm32f1/Makefile.include b/examples/stm32f1/Makefile.include
index 221ebaea..82e6d2a4 100644
--- a/examples/stm32f1/Makefile.include
+++ b/examples/stm32f1/Makefile.include
@@ -25,12 +25,12 @@ LD		= $(PREFIX)-gcc
 OBJCOPY		= $(PREFIX)-objcopy
 OBJDUMP		= $(PREFIX)-objdump
 # Uncomment this line if you want to use the installed (not local) library.
-TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
-#TOOLCHAIN_DIR   = ../../../..
+#TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
+TOOLCHAIN_DIR   = ../../../..
 CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
-		   -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD
+		   -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD -DSTM32F1
 LDSCRIPT	= $(BINARY).ld
-LDFLAGS		+= -lc -lnosys -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32 \
+LDFLAGS		+= -lc -lnosys -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32f1 \
 		   -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \
 		   -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
 OBJS		+= $(BINARY).o
@@ -75,13 +75,13 @@ flash: $(BINARY).flash
 	@#printf "  OBJDUMP $(*).list\n"
 	$(Q)$(OBJDUMP) -S $(*).elf > $(*).list
 
-foo.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32.a
+foo.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32f1/libopencm3_stm32f1.a
 	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(LD) -o foo.elf $(OBJS) -lopencm3_stm32 $(LDFLAGS)
+	$(Q)$(LD) -o foo.elf $(OBJS) -lopencm3_stm32f1 $(LDFLAGS)
 
-%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32.a
+%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32f1/libopencm3_stm32f1.a
 	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32 $(LDFLAGS)
+	$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32f1 $(LDFLAGS)
 
 %.o: %.c Makefile
 	@#printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
diff --git a/examples/stm32f1/lisa-m/fancyblink/fancyblink.c b/examples/stm32f1/lisa-m/fancyblink/fancyblink.c
index 5987bdf2..6d5fbe3a 100644
--- a/examples/stm32f1/lisa-m/fancyblink/fancyblink.c
+++ b/examples/stm32f1/lisa-m/fancyblink/fancyblink.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 /* Set STM32 to 72 MHz. */
 void clock_setup(void)
diff --git a/examples/stm32f1/lisa-m/fancyblink/fancyblink.ld b/examples/stm32f1/lisa-m/fancyblink/fancyblink.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/lisa-m/fancyblink/fancyblink.ld
+++ b/examples/stm32f1/lisa-m/fancyblink/fancyblink.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/lisa-m/usb_dfu/usbdfu.c b/examples/stm32f1/lisa-m/usb_dfu/usbdfu.c
index 7ffbc745..9d184f16 100644
--- a/examples/stm32f1/lisa-m/usb_dfu/usbdfu.c
+++ b/examples/stm32f1/lisa-m/usb_dfu/usbdfu.c
@@ -18,10 +18,10 @@
  */
 
 #include <string.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/dfu.h>
 
diff --git a/examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld b/examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld
index 54e5dac7..6a01797d 100644
--- a/examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld
+++ b/examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld
@@ -25,5 +25,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/lisa-m/usb_hid/usbhid.c b/examples/stm32f1/lisa-m/usb_hid/usbhid.c
index f42454bf..cd9d97dc 100644
--- a/examples/stm32f1/lisa-m/usb_hid/usbhid.c
+++ b/examples/stm32f1/lisa-m/usb_hid/usbhid.c
@@ -19,8 +19,8 @@
  */
 
 #include <stdlib.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/systick.h>
 #include <libopencm3/stm32/otg_fs.h>
 #include <libopencm3/usb/usbd.h>
@@ -30,7 +30,7 @@
 #define INCLUDE_DFU_INTERFACE
 
 #ifdef INCLUDE_DFU_INTERFACE
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/dfu.h>
 #endif
 
diff --git a/examples/stm32f1/lisa-m/usb_hid/usbhid.ld b/examples/stm32f1/lisa-m/usb_hid/usbhid.ld
index 928c898a..d0df9e64 100644
--- a/examples/stm32f1/lisa-m/usb_hid/usbhid.ld
+++ b/examples/stm32f1/lisa-m/usb_hid/usbhid.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/mb525/fancyblink/fancyblink.c b/examples/stm32f1/mb525/fancyblink/fancyblink.c
index e9a35646..54ef47c3 100644
--- a/examples/stm32f1/mb525/fancyblink/fancyblink.c
+++ b/examples/stm32f1/mb525/fancyblink/fancyblink.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 void clock_setup(void)
 {
diff --git a/examples/stm32f1/mb525/fancyblink/fancyblink.ld b/examples/stm32f1/mb525/fancyblink/fancyblink.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/mb525/fancyblink/fancyblink.ld
+++ b/examples/stm32f1/mb525/fancyblink/fancyblink.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/mb525/pwmleds/pwmleds.c b/examples/stm32f1/mb525/pwmleds/pwmleds.c
index 393928f3..55052312 100644
--- a/examples/stm32f1/mb525/pwmleds/pwmleds.c
+++ b/examples/stm32f1/mb525/pwmleds/pwmleds.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/timer.h>
 
 // #define COMPARE
diff --git a/examples/stm32f1/mb525/pwmleds/pwmleds.ld b/examples/stm32f1/mb525/pwmleds/pwmleds.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/mb525/pwmleds/pwmleds.ld
+++ b/examples/stm32f1/mb525/pwmleds/pwmleds.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/obldc/can/can.c b/examples/stm32f1/obldc/can/can.c
index 6c63c484..00a05dca 100644
--- a/examples/stm32f1/obldc/can/can.c
+++ b/examples/stm32f1/obldc/can/can.c
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/nvic.h>
 #include <libopencm3/stm32/systick.h>
 #include <libopencm3/stm32/can.h>
diff --git a/examples/stm32f1/obldc/can/can.ld b/examples/stm32f1/obldc/can/can.ld
index c0765211..4f609a88 100644
--- a/examples/stm32f1/obldc/can/can.ld
+++ b/examples/stm32f1/obldc/can/can.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/obldc/led/led.c b/examples/stm32f1/obldc/led/led.c
index 09ae89de..db479b22 100644
--- a/examples/stm32f1/obldc/led/led.c
+++ b/examples/stm32f1/obldc/led/led.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 /* Set STM32 to 72 MHz. */
 void clock_setup(void)
diff --git a/examples/stm32f1/obldc/led/led.ld b/examples/stm32f1/obldc/led/led.ld
index 78997732..edb52c5a 100644
--- a/examples/stm32f1/obldc/led/led.ld
+++ b/examples/stm32f1/obldc/led/led.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/obldc/pwmleds/pwmleds.c b/examples/stm32f1/obldc/pwmleds/pwmleds.c
index 146bb568..faa9aa07 100644
--- a/examples/stm32f1/obldc/pwmleds/pwmleds.c
+++ b/examples/stm32f1/obldc/pwmleds/pwmleds.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/timer.h>
 
 // #define COMPARE
diff --git a/examples/stm32f1/obldc/pwmleds/pwmleds.ld b/examples/stm32f1/obldc/pwmleds/pwmleds.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/obldc/pwmleds/pwmleds.ld
+++ b/examples/stm32f1/obldc/pwmleds/pwmleds.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/obldc/systick/systick.c b/examples/stm32f1/obldc/systick/systick.c
index 3d75c4aa..263230f8 100644
--- a/examples/stm32f1/obldc/systick/systick.c
+++ b/examples/stm32f1/obldc/systick/systick.c
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/nvic.h>
 #include <libopencm3/stm32/systick.h>
 
diff --git a/examples/stm32f1/obldc/systick/systick.ld b/examples/stm32f1/obldc/systick/systick.ld
index da4f2b37..a3195d22 100644
--- a/examples/stm32f1/obldc/systick/systick.ld
+++ b/examples/stm32f1/obldc/systick/systick.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/obldc/usart/usart.c b/examples/stm32f1/obldc/usart/usart.c
index ea5ec0e6..b2efe71d 100644
--- a/examples/stm32f1/obldc/usart/usart.c
+++ b/examples/stm32f1/obldc/usart/usart.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 
 void clock_setup(void)
@@ -47,7 +47,7 @@ void usart_setup(void)
                       GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_RE_TX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 230400);
+	usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_mode(USART1, USART_MODE_TX);
diff --git a/examples/stm32f1/obldc/usart/usart.ld b/examples/stm32f1/obldc/usart/usart.ld
index 78997732..edb52c5a 100644
--- a/examples/stm32f1/obldc/usart/usart.ld
+++ b/examples/stm32f1/obldc/usart/usart.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/obldc/usart_irq/usart_irq.c b/examples/stm32f1/obldc/usart_irq/usart_irq.c
index 82320c1a..20ff0a14 100644
--- a/examples/stm32f1/obldc/usart_irq/usart_irq.c
+++ b/examples/stm32f1/obldc/usart_irq/usart_irq.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/nvic.h>
 
@@ -52,7 +52,7 @@ void usart_setup(void)
 		      GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RE_RX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 230400);
+	usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_parity(USART1, USART_PARITY_NONE);
diff --git a/examples/stm32f1/obldc/usart_irq/usart_irq.ld b/examples/stm32f1/obldc/usart_irq/usart_irq.ld
index 78997732..edb52c5a 100644
--- a/examples/stm32f1/obldc/usart_irq/usart_irq.ld
+++ b/examples/stm32f1/obldc/usart_irq/usart_irq.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/adc_temperature_sensor/adc.c b/examples/stm32f1/other/adc_temperature_sensor/adc.c
index 6c0e828e..a87909cd 100644
--- a/examples/stm32f1/other/adc_temperature_sensor/adc.c
+++ b/examples/stm32f1/other/adc_temperature_sensor/adc.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/adc.h>
 #include <libopencm3/stm32/usart.h>
-#include <libopencm3/stm32/adc.h>
 
 void usart_setup(void)
 {
@@ -34,7 +34,7 @@ void usart_setup(void)
 	              GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 115200);
+	usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_mode(USART1, USART_MODE_TX_RX);
diff --git a/examples/stm32f1/other/adc_temperature_sensor/adc.ld b/examples/stm32f1/other/adc_temperature_sensor/adc.ld
index c0765211..4f609a88 100644
--- a/examples/stm32f1/other/adc_temperature_sensor/adc.ld
+++ b/examples/stm32f1/other/adc_temperature_sensor/adc.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/dma_mem2mem/dma.c b/examples/stm32f1/other/dma_mem2mem/dma.c
index e43fe0df..03894120 100644
--- a/examples/stm32f1/other/dma_mem2mem/dma.c
+++ b/examples/stm32f1/other/dma_mem2mem/dma.c
@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/dma.h>
 #include <libopencm3/stm32/usart.h>
-#include <libopencm3/stm32/dma.h>
 
 void usart_setup(void)
 {
@@ -34,7 +34,7 @@ void usart_setup(void)
 	              GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 115200);
+	usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_mode(USART1, USART_MODE_TX_RX);
diff --git a/examples/stm32f1/other/dma_mem2mem/dma.ld b/examples/stm32f1/other/dma_mem2mem/dma.ld
index c0765211..4f609a88 100644
--- a/examples/stm32f1/other/dma_mem2mem/dma.ld
+++ b/examples/stm32f1/other/dma_mem2mem/dma.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/dogm128/dogm128.h b/examples/stm32f1/other/dogm128/dogm128.h
index ed514abf..de432255 100644
--- a/examples/stm32f1/other/dogm128/dogm128.h
+++ b/examples/stm32f1/other/dogm128/dogm128.h
@@ -21,7 +21,7 @@
 #define DOGM128_H
 
 #include <libopencm3/cm3/common.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/spi.h>
 
 /* PB10 GPIO       - ~RESET 
diff --git a/examples/stm32f1/other/dogm128/main.c b/examples/stm32f1/other/dogm128/main.c
index b12a36d8..508971ed 100644
--- a/examples/stm32f1/other/dogm128/main.c
+++ b/examples/stm32f1/other/dogm128/main.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/timer.h>
 #include <libopencm3/stm32/nvic.h>
diff --git a/examples/stm32f1/other/dogm128/main.ld b/examples/stm32f1/other/dogm128/main.ld
index c0765211..4f609a88 100644
--- a/examples/stm32f1/other/dogm128/main.ld
+++ b/examples/stm32f1/other/dogm128/main.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c b/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
index f70c80d5..d8f24040 100644
--- a/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
+++ b/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/i2c.h>
 #include "stts75.h"
@@ -35,7 +35,7 @@ void usart_setup(void)
 	              GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 115200);
+	usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_mode(USART1, USART_MODE_TX_RX);
diff --git a/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld b/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
index c0765211..4f609a88 100644
--- a/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
+++ b/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/rtc/rtc.c b/examples/stm32f1/other/rtc/rtc.c
index c447534a..28ae24ca 100644
--- a/examples/stm32f1/other/rtc/rtc.c
+++ b/examples/stm32f1/other/rtc/rtc.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/rtc.h>
 #include <libopencm3/stm32/usart.h>
-#include <libopencm3/stm32/rtc.h>
 #include <libopencm3/stm32/pwr.h>
 #include <libopencm3/stm32/nvic.h>
 
@@ -43,7 +43,7 @@ void usart_setup(void)
                       GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 38400);
+	usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_mode(USART1, USART_MODE_TX);
diff --git a/examples/stm32f1/other/rtc/rtc.ld b/examples/stm32f1/other/rtc/rtc.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/other/rtc/rtc.ld
+++ b/examples/stm32f1/other/rtc/rtc.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/systick/systick.c b/examples/stm32f1/other/systick/systick.c
index c05aff74..173ff2af 100644
--- a/examples/stm32f1/other/systick/systick.c
+++ b/examples/stm32f1/other/systick/systick.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/nvic.h>
 #include <libopencm3/stm32/systick.h>
 
diff --git a/examples/stm32f1/other/systick/systick.ld b/examples/stm32f1/other/systick/systick.ld
index c0765211..4f609a88 100644
--- a/examples/stm32f1/other/systick/systick.ld
+++ b/examples/stm32f1/other/systick/systick.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/timer_interrupt/timer.c b/examples/stm32f1/other/timer_interrupt/timer.c
index aa2cdb67..422df885 100644
--- a/examples/stm32f1/other/timer_interrupt/timer.c
+++ b/examples/stm32f1/other/timer_interrupt/timer.c
@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/timer.h>
 #include <libopencm3/stm32/nvic.h>
 
diff --git a/examples/stm32f1/other/timer_interrupt/timer.ld b/examples/stm32f1/other/timer_interrupt/timer.ld
index c0765211..4f609a88 100644
--- a/examples/stm32f1/other/timer_interrupt/timer.ld
+++ b/examples/stm32f1/other/timer_interrupt/timer.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/usb_cdcacm/cdcacm.c b/examples/stm32f1/other/usb_cdcacm/cdcacm.c
index fdc92e24..d26b898e 100644
--- a/examples/stm32f1/other/usb_cdcacm/cdcacm.c
+++ b/examples/stm32f1/other/usb_cdcacm/cdcacm.c
@@ -18,8 +18,8 @@
  */
 
 #include <stdlib.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/cdc.h>
 
diff --git a/examples/stm32f1/other/usb_cdcacm/cdcacm.ld b/examples/stm32f1/other/usb_cdcacm/cdcacm.ld
index 1c20282d..3cd63164 100644
--- a/examples/stm32f1/other/usb_cdcacm/cdcacm.ld
+++ b/examples/stm32f1/other/usb_cdcacm/cdcacm.ld
@@ -25,5 +25,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/usb_dfu/usbdfu.c b/examples/stm32f1/other/usb_dfu/usbdfu.c
index 7ffbc745..9d184f16 100644
--- a/examples/stm32f1/other/usb_dfu/usbdfu.c
+++ b/examples/stm32f1/other/usb_dfu/usbdfu.c
@@ -18,10 +18,10 @@
  */
 
 #include <string.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/dfu.h>
 
diff --git a/examples/stm32f1/other/usb_dfu/usbdfu.ld b/examples/stm32f1/other/usb_dfu/usbdfu.ld
index 54e5dac7..6a01797d 100644
--- a/examples/stm32f1/other/usb_dfu/usbdfu.ld
+++ b/examples/stm32f1/other/usb_dfu/usbdfu.ld
@@ -25,5 +25,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/other/usb_hid/usbhid.c b/examples/stm32f1/other/usb_hid/usbhid.c
index 8f08aac9..7c0186e9 100644
--- a/examples/stm32f1/other/usb_hid/usbhid.c
+++ b/examples/stm32f1/other/usb_hid/usbhid.c
@@ -18,8 +18,8 @@
  */
 
 #include <stdlib.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/systick.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/hid.h>
@@ -28,7 +28,7 @@
 #define INCLUDE_DFU_INTERFACE
 
 #ifdef INCLUDE_DFU_INTERFACE
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/dfu.h>
 #endif
 
diff --git a/examples/stm32f1/other/usb_hid/usbhid.ld b/examples/stm32f1/other/usb_hid/usbhid.ld
index 1c20282d..3cd63164 100644
--- a/examples/stm32f1/other/usb_hid/usbhid.ld
+++ b/examples/stm32f1/other/usb_hid/usbhid.ld
@@ -25,5 +25,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-discovery/button/button.c b/examples/stm32f1/stm32-discovery/button/button.c
index b84f0746..87ce5cc9 100644
--- a/examples/stm32f1/stm32-discovery/button/button.c
+++ b/examples/stm32f1/stm32-discovery/button/button.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 u16 exti_line_state;
 
diff --git a/examples/stm32f1/stm32-discovery/button/button.ld b/examples/stm32f1/stm32-discovery/button/button.ld
index b03f90f7..157204a7 100644
--- a/examples/stm32f1/stm32-discovery/button/button.ld
+++ b/examples/stm32f1/stm32-discovery/button/button.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.c b/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.c
index d40fb7b3..38a4c4b5 100644
--- a/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.c
+++ b/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.c
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 /* Set STM32 to 24 MHz. */
 void clock_setup(void)
diff --git a/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.ld b/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.ld
index b03f90f7..157204a7 100644
--- a/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.ld
+++ b/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-discovery/miniblink/miniblink.c b/examples/stm32f1/stm32-discovery/miniblink/miniblink.c
index a05f9576..973fab5d 100644
--- a/examples/stm32f1/stm32-discovery/miniblink/miniblink.c
+++ b/examples/stm32f1/stm32-discovery/miniblink/miniblink.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 void gpio_setup(void)
 {
diff --git a/examples/stm32f1/stm32-discovery/miniblink/miniblink.ld b/examples/stm32f1/stm32-discovery/miniblink/miniblink.ld
index b03f90f7..157204a7 100644
--- a/examples/stm32f1/stm32-discovery/miniblink/miniblink.ld
+++ b/examples/stm32f1/stm32-discovery/miniblink/miniblink.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-discovery/rtc/rtc.c b/examples/stm32f1/stm32-discovery/rtc/rtc.c
index c99920f8..fa8a9664 100644
--- a/examples/stm32f1/stm32-discovery/rtc/rtc.c
+++ b/examples/stm32f1/stm32-discovery/rtc/rtc.c
@@ -18,10 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/rtc.h>
 #include <libopencm3/stm32/usart.h>
-#include <libopencm3/stm32/rtc.h>
 #include <libopencm3/stm32/pwr.h>
 #include <libopencm3/stm32/nvic.h>
 
diff --git a/examples/stm32f1/stm32-discovery/rtc/rtc.ld b/examples/stm32f1/stm32-discovery/rtc/rtc.ld
index b03f90f7..157204a7 100644
--- a/examples/stm32f1/stm32-discovery/rtc/rtc.ld
+++ b/examples/stm32f1/stm32-discovery/rtc/rtc.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-discovery/usart/usart.c b/examples/stm32f1/stm32-discovery/usart/usart.c
index 05d03124..942805b5 100644
--- a/examples/stm32f1/stm32-discovery/usart/usart.c
+++ b/examples/stm32f1/stm32-discovery/usart/usart.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 
 void clock_setup(void)
diff --git a/examples/stm32f1/stm32-discovery/usart/usart.ld b/examples/stm32f1/stm32-discovery/usart/usart.ld
index b03f90f7..157204a7 100644
--- a/examples/stm32f1/stm32-discovery/usart/usart.ld
+++ b/examples/stm32f1/stm32-discovery/usart/usart.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/button/button.c b/examples/stm32f1/stm32-h103/button/button.c
index 63f32744..2f3378c5 100644
--- a/examples/stm32f1/stm32-h103/button/button.c
+++ b/examples/stm32f1/stm32-h103/button/button.c
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
 #include <libopencm3/stm32/exti.h>
 
 u16 exti_line_state;
diff --git a/examples/stm32f1/stm32-h103/button/button.ld b/examples/stm32f1/stm32-h103/button/button.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/button/button.ld
+++ b/examples/stm32f1/stm32-h103/button/button.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/exti_both/exti_both.c b/examples/stm32f1/stm32-h103/exti_both/exti_both.c
index edfc676d..7c6f9c7a 100644
--- a/examples/stm32f1/stm32-h103/exti_both/exti_both.c
+++ b/examples/stm32f1/stm32-h103/exti_both/exti_both.c
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
 #include <libopencm3/stm32/exti.h>
 
 u16 exti_line_state;
diff --git a/examples/stm32f1/stm32-h103/exti_both/exti_both.ld b/examples/stm32f1/stm32-h103/exti_both/exti_both.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/exti_both/exti_both.ld
+++ b/examples/stm32f1/stm32-h103/exti_both/exti_both.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c b/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
index af1268d6..b3c47ee9 100644
--- a/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
+++ b/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
 #include <libopencm3/stm32/exti.h>
 
 #define FALLING 0
diff --git a/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld b/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
+++ b/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/fancyblink/fancyblink.c b/examples/stm32f1/stm32-h103/fancyblink/fancyblink.c
index eeb3f348..1b2ad863 100644
--- a/examples/stm32f1/stm32-h103/fancyblink/fancyblink.c
+++ b/examples/stm32f1/stm32-h103/fancyblink/fancyblink.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 /* Set STM32 to 72 MHz. */
 void clock_setup(void)
diff --git a/examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld b/examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
+++ b/examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/led_stripe/led_stripe.c b/examples/stm32f1/stm32-h103/led_stripe/led_stripe.c
index 9cf9d4f1..15768662 100644
--- a/examples/stm32f1/stm32-h103/led_stripe/led_stripe.c
+++ b/examples/stm32f1/stm32-h103/led_stripe/led_stripe.c
@@ -26,8 +26,8 @@
 
 #include <stdlib.h>
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 #define SPI_BANK GPIOB
 #define SCLK_PIN GPIO13
diff --git a/examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld b/examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld
+++ b/examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/miniblink/miniblink.c b/examples/stm32f1/stm32-h103/miniblink/miniblink.c
index 6f8bc2cd..b003f9a2 100644
--- a/examples/stm32f1/stm32-h103/miniblink/miniblink.c
+++ b/examples/stm32f1/stm32-h103/miniblink/miniblink.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 void gpio_setup(void)
 {
diff --git a/examples/stm32f1/stm32-h103/miniblink/miniblink.ld b/examples/stm32f1/stm32-h103/miniblink/miniblink.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/miniblink/miniblink.ld
+++ b/examples/stm32f1/stm32-h103/miniblink/miniblink.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c b/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c
index bda8ff79..9f9390ac 100644
--- a/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c
+++ b/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>
 #include <libopencm3/stm32/exti.h>
 
 #define FALLING 0
diff --git a/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld b/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld
+++ b/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/spi/spi.c b/examples/stm32f1/stm32-h103/spi/spi.c
index 5a36bb8b..89b8a686 100644
--- a/examples/stm32f1/stm32-h103/spi/spi.c
+++ b/examples/stm32f1/stm32-h103/spi/spi.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f1/rcc.h>
 #include <libopencm3/stm32/spi.h>
 
 void clock_setup(void)
diff --git a/examples/stm32f1/stm32-h103/spi/spi.ld b/examples/stm32f1/stm32-h103/spi/spi.ld
index 25806f8d..e2fb5b63 100644
--- a/examples/stm32f1/stm32-h103/spi/spi.ld
+++ b/examples/stm32f1/stm32-h103/spi/spi.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/timer/timer.c b/examples/stm32f1/stm32-h103/timer/timer.c
index ea64c860..48cae129 100644
--- a/examples/stm32f1/stm32-h103/timer/timer.c
+++ b/examples/stm32f1/stm32-h103/timer/timer.c
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/nvic.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>
 #include <libopencm3/stm32/exti.h>
 
 u16 frequency_sequence[18] = {
diff --git a/examples/stm32f1/stm32-h103/timer/timer.ld b/examples/stm32f1/stm32-h103/timer/timer.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/timer/timer.ld
+++ b/examples/stm32f1/stm32-h103/timer/timer.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/traceswo/traceswo.c b/examples/stm32f1/stm32-h103/traceswo/traceswo.c
index ac461bb4..88814479 100644
--- a/examples/stm32f1/stm32-h103/traceswo/traceswo.c
+++ b/examples/stm32f1/stm32-h103/traceswo/traceswo.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 #include <libopencm3/stm32/dbgmcu.h>
 #include <libopencm3/cm3/scs.h>
diff --git a/examples/stm32f1/stm32-h103/traceswo/traceswo.ld b/examples/stm32f1/stm32-h103/traceswo/traceswo.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/traceswo/traceswo.ld
+++ b/examples/stm32f1/stm32-h103/traceswo/traceswo.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/usart/usart.c b/examples/stm32f1/stm32-h103/usart/usart.c
index 9692d612..a221acb5 100644
--- a/examples/stm32f1/stm32-h103/usart/usart.c
+++ b/examples/stm32f1/stm32-h103/usart/usart.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 
 void clock_setup(void)
@@ -40,7 +40,7 @@ void usart_setup(void)
                       GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 38400);
+	usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_mode(USART1, USART_MODE_TX);
@@ -55,7 +55,7 @@ void usart_setup(void)
                       GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART2_TX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART2, 38400);
+	usart_set_baudrate(USART2, 38400, rcc_ppre1_frequency);
 	usart_set_databits(USART2, 8);
 	usart_set_stopbits(USART2, USART_STOPBITS_1);
 	usart_set_mode(USART2, USART_MODE_TX);
@@ -70,7 +70,7 @@ void usart_setup(void)
                       GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART3_TX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART3, 38400);
+	usart_set_baudrate(USART3, 38400, rcc_ppre1_frequency);
 	usart_set_databits(USART3, 8);
 	usart_set_stopbits(USART3, USART_STOPBITS_1);
 	usart_set_mode(USART3, USART_MODE_TX);
diff --git a/examples/stm32f1/stm32-h103/usart/usart.ld b/examples/stm32f1/stm32-h103/usart/usart.ld
index 7ea2b92c..3409b98d 100644
--- a/examples/stm32f1/stm32-h103/usart/usart.ld
+++ b/examples/stm32f1/stm32-h103/usart/usart.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/usart_irq/usart_irq.c b/examples/stm32f1/stm32-h103/usart_irq/usart_irq.c
index 9b957dcc..a2d8eef5 100644
--- a/examples/stm32f1/stm32-h103/usart_irq/usart_irq.c
+++ b/examples/stm32f1/stm32-h103/usart_irq/usart_irq.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/nvic.h>
 
@@ -49,7 +49,7 @@ void usart_setup(void)
 		      GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 230400);
+	usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_parity(USART1, USART_PARITY_NONE);
diff --git a/examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld b/examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
index 78997732..edb52c5a 100644
--- a/examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
+++ b/examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c b/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
index 42a74729..deee527f 100644
--- a/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
+++ b/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/nvic.h>
 #include <libopencm3/stm32/systick.h>
@@ -145,7 +145,7 @@ void usart_setup(void)
 		      GPIO_CNF_INPUT_FLOAT, GPIO_USART1_RX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 230400);
+	usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_parity(USART1, USART_PARITY_NONE);
diff --git a/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld b/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
index 78997732..edb52c5a 100644
--- a/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
+++ b/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/usart_printf/usart_printf.c b/examples/stm32f1/stm32-h103/usart_printf/usart_printf.c
index 26fcee60..1eb067f9 100644
--- a/examples/stm32f1/stm32-h103/usart_printf/usart_printf.c
+++ b/examples/stm32f1/stm32-h103/usart_printf/usart_printf.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/stm32/nvic.h>
 
@@ -46,7 +46,7 @@ void usart_setup(void)
                       GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX);
 
 	/* Setup UART parameters. */
-	usart_set_baudrate(USART1, 230400);
+	usart_set_baudrate(USART1, 230400, rcc_ppre2_frequency);
 	usart_set_databits(USART1, 8);
 	usart_set_stopbits(USART1, USART_STOPBITS_1);
 	usart_set_parity(USART1, USART_PARITY_NONE);
diff --git a/examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld b/examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld
index 78997732..edb52c5a 100644
--- a/examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld
+++ b/examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c
index 4b906408..f9e25273 100644
--- a/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c
+++ b/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c
@@ -18,8 +18,8 @@
  */
 
 #include <stdlib.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/cdc.h>
 
diff --git a/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld b/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld
index 928c898a..d0df9e64 100644
--- a/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld
+++ b/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
index 7ffbc745..9d184f16 100644
--- a/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
+++ b/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
@@ -18,10 +18,10 @@
  */
 
 #include <string.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/dfu.h>
 
diff --git a/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld b/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld
index 54e5dac7..6a01797d 100644
--- a/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld
+++ b/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld
@@ -25,5 +25,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/usb_hid/usbhid.c b/examples/stm32f1/stm32-h103/usb_hid/usbhid.c
index a21fce60..a815573a 100644
--- a/examples/stm32f1/stm32-h103/usb_hid/usbhid.c
+++ b/examples/stm32f1/stm32-h103/usb_hid/usbhid.c
@@ -18,8 +18,8 @@
  */
 
 #include <stdlib.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 #include <libopencm3/stm32/systick.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/hid.h>
@@ -28,7 +28,7 @@
 #define INCLUDE_DFU_INTERFACE
 
 #ifdef INCLUDE_DFU_INTERFACE
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/dfu.h>
 #endif
 
diff --git a/examples/stm32f1/stm32-h103/usb_hid/usbhid.ld b/examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
index 928c898a..d0df9e64 100644
--- a/examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
+++ b/examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h103/usb_iap/usbiap.c b/examples/stm32f1/stm32-h103/usb_iap/usbiap.c
index 7ffbc745..9d184f16 100644
--- a/examples/stm32f1/stm32-h103/usb_iap/usbiap.c
+++ b/examples/stm32f1/stm32-h103/usb_iap/usbiap.c
@@ -18,10 +18,10 @@
  */
 
 #include <string.h>
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
-#include <libopencm3/stm32/flash.h>
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/f1/flash.h>
+#include <libopencm3/stm32/f1/scb.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/dfu.h>
 
diff --git a/examples/stm32f1/stm32-h103/usb_iap/usbiap.ld b/examples/stm32f1/stm32-h103/usb_iap/usbiap.ld
index 928c898a..d0df9e64 100644
--- a/examples/stm32f1/stm32-h103/usb_iap/usbiap.ld
+++ b/examples/stm32f1/stm32-h103/usb_iap/usbiap.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h107/fancyblink/fancyblink.c b/examples/stm32f1/stm32-h107/fancyblink/fancyblink.c
index c73d3d40..4d458291 100644
--- a/examples/stm32f1/stm32-h107/fancyblink/fancyblink.c
+++ b/examples/stm32f1/stm32-h107/fancyblink/fancyblink.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 /* Set STM32 to 72 MHz. */
 void clock_setup(void)
diff --git a/examples/stm32f1/stm32-h107/fancyblink/fancyblink.ld b/examples/stm32f1/stm32-h107/fancyblink/fancyblink.ld
index 6c9c7660..d35c1417 100644
--- a/examples/stm32f1/stm32-h107/fancyblink/fancyblink.ld
+++ b/examples/stm32f1/stm32-h107/fancyblink/fancyblink.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f1/stm32-h107/usb_simple/usb_simple.c b/examples/stm32f1/stm32-h107/usb_simple/usb_simple.c
index 85f67df7..c30803c3 100644
--- a/examples/stm32f1/stm32-h107/usb_simple/usb_simple.c
+++ b/examples/stm32f1/stm32-h107/usb_simple/usb_simple.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/rcc.h>
-#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/f1/rcc.h>
+#include <libopencm3/stm32/f1/gpio.h>
 
 #include <libopencm3/usb/usbd.h>
 
diff --git a/examples/stm32f1/stm32-h107/usb_simple/usb_simple.ld b/examples/stm32f1/stm32-h107/usb_simple/usb_simple.ld
index 6c9c7660..d35c1417 100644
--- a/examples/stm32f1/stm32-h107/usb_simple/usb_simple.ld
+++ b/examples/stm32f1/stm32-h107/usb_simple/usb_simple.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f1.ld
 
diff --git a/examples/stm32f2/jobygps/usart_printf/usart_printf.ld b/examples/stm32f2/jobygps/usart_printf/usart_printf.ld
index 78997732..e80bdbda 100644
--- a/examples/stm32f2/jobygps/usart_printf/usart_printf.ld
+++ b/examples/stm32f2/jobygps/usart_printf/usart_printf.ld
@@ -27,5 +27,5 @@ MEMORY
 }
 
 /* Include the common ld script. */
-INCLUDE libopencm3_stm32.ld
+INCLUDE libopencm3_stm32f2.ld