Some more file/path restructuring.

All #includes now explicitly use the "<libopencm3/stm32/rcc.h>" format. If you want to get rid of the "libopencm3" prefix in your local project you can add a respective -I entry in your Makefile (not recommended though). All .ld files and .a libs are installed in $(TOOLCHAIN_DIR)/lib directly (as before), but are now renamed to avoid potential conflicts now or in the future. Examples: libopencm3_lpc13xx.a libopencm3_lpc13xx.ld libopencm3_stm32.a libopencm3_stm32.ld
2010-12-31 18:18:39 +01:00 · 2010-12-31 18:18:39 +01:00 · 8f251e8a9d
commit 8f251e8a9d
parent 95793aa6ce
119 changed files with 249 additions and 252 deletions
--- a/8
+++ b/8
@ -50,12 +50,12 @@ examples: lib
 install: build
 	@printf "  INSTALL headers\n"
 	$(Q)$(INSTALL) -d $(INCDIR)/libopencm3
-	$(Q)$(INSTALL) -d $(LIBDIR)/libopencm3
-	$(Q)cp -r include/* $(INCDIR)/libopencm3
+	$(Q)$(INSTALL) -d $(LIBDIR)
+	$(Q)cp -r include/libopencm3/* $(INCDIR)/libopencm3
 	@printf "  INSTALL libs\n"
-	$(Q)$(INSTALL) -m 0644 lib/*/*.a $(LIBDIR)/libopencm3
+	$(Q)$(INSTALL) -m 0644 lib/*/*.a $(LIBDIR)
 	@printf "  INSTALL ldscripts\n"
-	$(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR)/libopencm3
+	$(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR)

 clean:
 	$(Q)$(MAKE) -C examples/stm32 clean
--- a/examples/lpc13xx/Makefile.include
+++ b/examples/lpc13xx/Makefile.include
@ -30,8 +30,7 @@ TOOLCHAIN_DIR   = ../../../..
 CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
 		   -mcpu=cortex-m3 -mthumb
 LDSCRIPT	= $(BINARY).ld
-LDFLAGS         += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/libopencm3 \
-		   -L$(TOOLCHAIN_DIR)/lib/lpc13xx \
+LDFLAGS         += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/lpc13xx \
 		   -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections
 OBJS		+= $(BINARY).o

--- a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c
+++ b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c
@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-// #include <lpc13xx/rcc.h>
-#include <lpc13xx/gpio.h>
+// #include <libopencm3/lpc13xx/rcc.h>
+#include <libopencm3/lpc13xx/gpio.h>

 void gpio_setup(void)
 {
--- a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld
+++ b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE lpc13xx.ld
+INCLUDE libopencm3_lpc13xx.ld

--- a/examples/stm32/Makefile.include
+++ b/examples/stm32/Makefile.include
@ -28,11 +28,9 @@ OBJDUMP		= $(PREFIX)-objdump
 # TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
 TOOLCHAIN_DIR   = ../../../..
 CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
-		   -I$(TOOLCHAIN_DIR)/include/libopencm3 -fno-common \
-		   -mcpu=cortex-m3 -mthumb
+		   -fno-common -mcpu=cortex-m3 -mthumb
 LDSCRIPT	= $(BINARY).ld
-LDFLAGS		+= -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/libopencm3 \
-		   -L$(TOOLCHAIN_DIR)/lib/stm32 \
+LDFLAGS		+= -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32 \
 		   -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections
 OBJS		+= $(BINARY).o

--- a/examples/stm32/lisa-m/usb_dfu/usbdfu.c
+++ b/examples/stm32/lisa-m/usb_dfu/usbdfu.c
@ -18,12 +18,12 @@
 */

 #include <string.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/flash.h>
-#include <stm32/scb.h>
-#include <usb/usbd.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/dfu.h>

 #define APP_ADDRESS	0x08002000

--- a/examples/stm32/lisa-m/usb_dfu/usbdfu.ld
+++ b/examples/stm32/lisa-m/usb_dfu/usbdfu.ld
@ -25,5 +25,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/lisa-m/usb_hid/usbhid.c
+++ b/examples/stm32/lisa-m/usb_hid/usbhid.c
@ -18,18 +18,18 @@
 */

 #include <stdlib.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/systick.h>
-#include <usb/usbd.h>
-#include <usb/hid.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/systick.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/hid.h>

 /* Define this to include the DFU APP interface. */
 #define INCLUDE_DFU_INTERFACE

 #ifdef INCLUDE_DFU_INTERFACE
-#include <stm32/scb.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/dfu.h>
 #endif

 const struct usb_device_descriptor dev = {
--- a/examples/stm32/lisa-m/usb_hid/usbhid.ld
+++ b/examples/stm32/lisa-m/usb_hid/usbhid.ld
@ -28,5 +28,5 @@ MEMORY


 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/mb525/fancyblink/fancyblink.c
+++ b/examples/stm32/mb525/fancyblink/fancyblink.c
@ -18,8 +18,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>

 void clock_setup(void)
 {
--- a/examples/stm32/mb525/fancyblink/fancyblink.ld
+++ b/examples/stm32/mb525/fancyblink/fancyblink.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/mb525/pwmleds/pwmleds.c
+++ b/examples/stm32/mb525/pwmleds/pwmleds.c
@ -17,9 +17,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/timer.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/timer.h>

 // #define COMPARE
 // #define MOVING_FADE
--- a/examples/stm32/mb525/pwmleds/pwmleds.ld
+++ b/examples/stm32/mb525/pwmleds/pwmleds.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/obldc/can/can.c
+++ b/examples/stm32/obldc/can/can.c
@ -18,12 +18,12 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/nvic.h>
-#include <stm32/systick.h>
-#include <stm32/can.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/systick.h>
+#include <libopencm3/stm32/can.h>

 struct can_tx_msg {
 	u32 std_id;
--- a/examples/stm32/obldc/can/can.ld
+++ b/examples/stm32/obldc/can/can.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/obldc/led/led.c
+++ b/examples/stm32/obldc/led/led.c
@ -18,8 +18,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>

 /* Set STM32 to 72 MHz. */
 void clock_setup(void)
--- a/examples/stm32/obldc/led/led.ld
+++ b/examples/stm32/obldc/led/led.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/obldc/systick/systick.c
+++ b/examples/stm32/obldc/systick/systick.c
@ -18,11 +18,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/nvic.h>
-#include <stm32/systick.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/systick.h>

 u32 temp32;

--- a/examples/stm32/obldc/systick/systick.ld
+++ b/examples/stm32/obldc/systick/systick.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/obldc/usart/usart.c
+++ b/examples/stm32/obldc/usart/usart.c
@ -17,9 +17,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>

 void clock_setup(void)
 {
--- a/examples/stm32/obldc/usart/usart.ld
+++ b/examples/stm32/obldc/usart/usart.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/obldc/usart_irq/usart_irq.c
+++ b/examples/stm32/obldc/usart_irq/usart_irq.c
@ -17,10 +17,10 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/nvic.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/nvic.h>

 void clock_setup(void)
 {
--- a/examples/stm32/obldc/usart_irq/usart_irq.ld
+++ b/examples/stm32/obldc/usart_irq/usart_irq.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/adc_temperature_sensor/adc.c
+++ b/examples/stm32/other/adc_temperature_sensor/adc.c
@ -17,11 +17,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/adc.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/adc.h>

 void usart_setup(void)
 {
--- a/examples/stm32/other/adc_temperature_sensor/adc.ld
+++ b/examples/stm32/other/adc_temperature_sensor/adc.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/dma_mem2mem/dma.c
+++ b/examples/stm32/other/dma_mem2mem/dma.c
@ -17,11 +17,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/dma.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/dma.h>

 void usart_setup(void)
 {
--- a/examples/stm32/other/dma_mem2mem/dma.ld
+++ b/examples/stm32/other/dma_mem2mem/dma.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/dogm128/dogm128.h
+++ b/examples/stm32/other/dogm128/dogm128.h
@ -20,9 +20,9 @@
 #ifndef DOGM128_H
 #define DOGM128_H

-#include <cm3/common.h>
-#include <stm32/gpio.h>
-#include <stm32/spi.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/spi.h>

 /* PB10 GPIO       - ~RESET 
 * PB12 SPI2_NSS   - ~CS1
--- a/examples/stm32/other/dogm128/main.c
+++ b/examples/stm32/other/dogm128/main.c
@ -17,13 +17,13 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/timer.h>
-#include <stm32/nvic.h>
-#include <stm32/spi.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/spi.h>
 #include "./dogm128.h"

 void gpio_setup(void)
--- a/examples/stm32/other/dogm128/main.ld
+++ b/examples/stm32/other/dogm128/main.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c
+++ b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c
@ -17,11 +17,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/i2c.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/i2c.h>
 #include "stts75.h"

 void usart_setup(void)
--- a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
+++ b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/i2c_stts75_sensor/stts75.c
+++ b/examples/stm32/other/i2c_stts75_sensor/stts75.c
@ -17,7 +17,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/i2c.h>
+#include <libopencm3/stm32/i2c.h>
 #include "stts75.h"

 void stts75_write_config(u32 i2c, u8 sensor)
--- a/examples/stm32/other/rtc/rtc.c
+++ b/examples/stm32/other/rtc/rtc.c
@ -17,12 +17,12 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/rtc.h>
-#include <stm32/pwr.h>
-#include <stm32/nvic.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/rtc.h>
+#include <libopencm3/stm32/pwr.h>
+#include <libopencm3/stm32/nvic.h>

 void clock_setup(void)
 {
--- a/examples/stm32/other/rtc/rtc.ld
+++ b/examples/stm32/other/rtc/rtc.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/systick/systick.c
+++ b/examples/stm32/other/systick/systick.c
@ -17,11 +17,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/nvic.h>
-#include <stm32/systick.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/systick.h>

 u32 temp32;

--- a/examples/stm32/other/systick/systick.ld
+++ b/examples/stm32/other/systick/systick.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/timer_interrupt/timer.c
+++ b/examples/stm32/other/timer_interrupt/timer.c
@ -17,11 +17,11 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/timer.h>
-#include <stm32/nvic.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>

 void gpio_setup(void)
 {
--- a/examples/stm32/other/timer_interrupt/timer.ld
+++ b/examples/stm32/other/timer_interrupt/timer.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/other/usb_cdcacm/cdcacm.c
@ -18,10 +18,10 @@
 */

 #include <stdlib.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <usb/usbd.h>
-#include <usb/cdc.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/cdc.h>

 static const struct usb_device_descriptor dev = {
        .bLength = USB_DT_DEVICE_SIZE,
--- a/examples/stm32/other/usb_cdcacm/cdcacm.ld
+++ b/examples/stm32/other/usb_cdcacm/cdcacm.ld
@ -25,5 +25,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/usb_dfu/usbdfu.c
+++ b/examples/stm32/other/usb_dfu/usbdfu.c
@ -18,12 +18,12 @@
 */

 #include <string.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/flash.h>
-#include <stm32/scb.h>
-#include <usb/usbd.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/dfu.h>

 #define APP_ADDRESS	0x08002000

--- a/examples/stm32/other/usb_dfu/usbdfu.ld
+++ b/examples/stm32/other/usb_dfu/usbdfu.ld
@ -25,5 +25,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/other/usb_hid/usbhid.c
+++ b/examples/stm32/other/usb_hid/usbhid.c
@ -18,18 +18,18 @@
 */

 #include <stdlib.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/systick.h>
-#include <usb/usbd.h>
-#include <usb/hid.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/systick.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/hid.h>

 /* Define this to include the DFU APP interface. */
 #define INCLUDE_DFU_INTERFACE

 #ifdef INCLUDE_DFU_INTERFACE
-#include <stm32/scb.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/dfu.h>
 #endif

 const struct usb_device_descriptor dev = {
--- a/examples/stm32/other/usb_hid/usbhid.ld
+++ b/examples/stm32/other/usb_hid/usbhid.ld
@ -25,5 +25,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/stm32-h103/fancyblink/fancyblink.c
+++ b/examples/stm32/stm32-h103/fancyblink/fancyblink.c
@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>

 /* Set STM32 to 72 MHz. */
 void clock_setup(void)
--- a/examples/stm32/stm32-h103/fancyblink/fancyblink.ld
+++ b/examples/stm32/stm32-h103/fancyblink/fancyblink.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/stm32-h103/miniblink/miniblink.c
+++ b/examples/stm32/stm32-h103/miniblink/miniblink.c
@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>

 void gpio_setup(void)
 {
--- a/examples/stm32/stm32-h103/miniblink/miniblink.ld
+++ b/examples/stm32/stm32-h103/miniblink/miniblink.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/stm32-h103/spi/spi.c
+++ b/examples/stm32/stm32-h103/spi/spi.c
@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/spi.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/spi.h>

 void clock_setup(void)
 {
--- a/examples/stm32/stm32-h103/spi/spi.ld
+++ b/examples/stm32/stm32-h103/spi/spi.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/stm32-h103/usart/usart.c
+++ b/examples/stm32/stm32-h103/usart/usart.c
@ -17,9 +17,9 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>

 void clock_setup(void)
 {
--- a/examples/stm32/stm32-h103/usart/usart.ld
+++ b/examples/stm32/stm32-h103/usart/usart.ld
@ -27,5 +27,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c
@ -18,10 +18,10 @@
 */

 #include <stdlib.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <usb/usbd.h>
-#include <usb/cdc.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/cdc.h>

 static const struct usb_device_descriptor dev = {
        .bLength = USB_DT_DEVICE_SIZE,
--- a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
+++ b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
@ -28,5 +28,5 @@ MEMORY


 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/stm32-h103/usb_dfu/usbdfu.c
+++ b/examples/stm32/stm32-h103/usb_dfu/usbdfu.c
@ -18,12 +18,12 @@
 */

 #include <string.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/flash.h>
-#include <stm32/scb.h>
-#include <usb/usbd.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/dfu.h>

 #define APP_ADDRESS	0x08002000

--- a/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
+++ b/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
@ -25,5 +25,5 @@ MEMORY
 }

 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/stm32-h103/usb_hid/usbhid.c
+++ b/examples/stm32/stm32-h103/usb_hid/usbhid.c
@ -18,18 +18,18 @@
 */

 #include <stdlib.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/systick.h>
-#include <usb/usbd.h>
-#include <usb/hid.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/systick.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/hid.h>

 /* Define this to include the DFU APP interface. */
 #define INCLUDE_DFU_INTERFACE

 #ifdef INCLUDE_DFU_INTERFACE
-#include <stm32/scb.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/dfu.h>
 #endif

 const struct usb_device_descriptor dev = {
--- a/examples/stm32/stm32-h103/usb_hid/usbhid.ld
+++ b/examples/stm32/stm32-h103/usb_hid/usbhid.ld
@ -28,5 +28,5 @@ MEMORY


 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/examples/stm32/stm32-h103/usb_iap/usbiap.c
+++ b/examples/stm32/stm32-h103/usb_iap/usbiap.c
@ -18,12 +18,12 @@
 */

 #include <string.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/flash.h>
-#include <stm32/scb.h>
-#include <usb/usbd.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/dfu.h>

 #define APP_ADDRESS	0x08002000

--- a/examples/stm32/stm32-h103/usb_iap/usbiap.ld
+++ b/examples/stm32/stm32-h103/usb_iap/usbiap.ld
@ -28,5 +28,5 @@ MEMORY


 /* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld

--- a/include/libopencm3/cm3/common.h
+++ b/include/libopencm3/cm3/common.h
--- a/include/libopencm3/cm3/memorymap.h
+++ b/include/libopencm3/cm3/memorymap.h
--- a/include/libopencm3/lpc13xx/gpio.h
+++ b/include/libopencm3/lpc13xx/gpio.h
@ -20,8 +20,8 @@
 #ifndef LPC13XX_GPIO_H
 #define LPC13XX_GPIO_H

-#include <cm3/common.h>
-#include <lpc13xx/memorymap.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/lpc13xx/memorymap.h>

 /* --- Convenience macros -------------------------------------------------- */

--- a/include/libopencm3/lpc13xx/memorymap.h
+++ b/include/libopencm3/lpc13xx/memorymap.h
@ -20,7 +20,7 @@
 #ifndef LPC13XX_MEMORYMAP_H
 #define LPC13XX_MEMORYMAP_H

-#include <cm3/common.h>
+#include <libopencm3/cm3/common.h>

 /* --- LPC13XX specific peripheral definitions ----------------------------- */

--- a/include/libopencm3/stm32/adc.h
+++ b/include/libopencm3/stm32/adc.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_ADC_H
 #define LIBOPENCM3_ADC_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- Convenience macros -------------------------------------------------- */

--- a/include/libopencm3/stm32/bkp.h
+++ b/include/libopencm3/stm32/bkp.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_BKP_H
 #define LIBOPENCM3_BKP_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- BKP registers ------------------------------------------------------- */

--- a/include/libopencm3/stm32/can.h
+++ b/include/libopencm3/stm32/can.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_CAN_H
 #define LIBOPENCM3_CAN_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- Convenience macros -------------------------------------------------- */

--- a/include/libopencm3/stm32/crc.h
+++ b/include/libopencm3/stm32/crc.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_CRC_H
 #define LIBOPENCM3_CRC_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- CRC registers ------------------------------------------------------- */

--- a/include/libopencm3/stm32/dma.h
+++ b/include/libopencm3/stm32/dma.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_DMA_H
 #define LIBOPENCM3_DMA_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- Convenience macros -------------------------------------------------- */

--- a/include/libopencm3/stm32/ethernet.h
+++ b/include/libopencm3/stm32/ethernet.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_ETHERNET_H
 #define LIBOPENCM3_ETHERNET_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* Ethernet MAC registers */
 #define ETH_MACCR			MMIO32(ETHERNET_BASE + 0x00)
--- a/include/libopencm3/stm32/exti.h
+++ b/include/libopencm3/stm32/exti.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_EXTI_H
 #define LIBOPENCM3_EXTI_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- EXTI registers ------------------------------------------------------ */

--- a/include/libopencm3/stm32/flash.h
+++ b/include/libopencm3/stm32/flash.h
@ -28,8 +28,8 @@
 #ifndef LIBOPENCM3_FLASH_H
 #define LIBOPENCM3_FLASH_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- FLASH registers ----------------------------------------------------- */

--- a/include/libopencm3/stm32/fsmc.h
+++ b/include/libopencm3/stm32/fsmc.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_FSMC_H
 #define LIBOPENCM3_FSMC_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- Convenience macros -------------------------------------------------- */

--- a/include/libopencm3/stm32/gpio.h
+++ b/include/libopencm3/stm32/gpio.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_GPIO_H
 #define LIBOPENCM3_GPIO_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- Convenience macros -------------------------------------------------- */

--- a/include/libopencm3/stm32/i2c.h
+++ b/include/libopencm3/stm32/i2c.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_I2C_H
 #define LIBOPENCM3_I2C_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- Convenience macros -------------------------------------------------- */

--- a/include/libopencm3/stm32/iwdg.h
+++ b/include/libopencm3/stm32/iwdg.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_IWDG_H
 #define LIBOPENCM3_IWDG_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- IWDG registers ------------------------------------------------------ */

--- a/include/libopencm3/stm32/memorymap.h
+++ b/include/libopencm3/stm32/memorymap.h
@ -20,7 +20,7 @@
 #ifndef LIBOPENCM3_MEMORYMAP_H
 #define LIBOPENCM3_MEMORYMAP_H

-#include <cm3/memorymap.h>
+#include <libopencm3/cm3/memorymap.h>

 /* --- STM32 specific peripheral definitions ------------------------------- */

--- a/include/libopencm3/stm32/nvic.h
+++ b/include/libopencm3/stm32/nvic.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_NVIC_H
 #define LIBOPENCM3_NVIC_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- NVIC Registers ------------------------------------------------------ */

--- a/include/libopencm3/stm32/pwr.h
+++ b/include/libopencm3/stm32/pwr.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_PWR_H
 #define LIBOPENCM3_PWR_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- PWR registers ------------------------------------------------------- */

--- a/include/libopencm3/stm32/rcc.h
+++ b/include/libopencm3/stm32/rcc.h
@ -21,8 +21,8 @@
 #ifndef LIBOPENCM3_RCC_H
 #define LIBOPENCM3_RCC_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* Note: Regs/bits marked (**) only exist in "connectivity line" STM32s. */
 /* Note: Regs/bits marked (XX) do NOT exist in "connectivity line" STM32s. */
--- a/include/libopencm3/stm32/rtc.h
+++ b/include/libopencm3/stm32/rtc.h
@ -20,9 +20,9 @@
 #ifndef LIBOPENCM3_RTC_H
 #define LIBOPENCM3_RTC_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
-#include <stm32/pwr.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/pwr.h>

 /* --- RTC registers ------------------------------------------------------- */

--- a/include/libopencm3/stm32/scb.h
+++ b/include/libopencm3/stm32/scb.h
@ -21,8 +21,8 @@
 #ifndef LIBOPENCM3_SCB_H
 #define LIBOPENCM3_SCB_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- SCB: Registers ------------------------------------------------------ */

--- a/include/libopencm3/stm32/spi.h
+++ b/include/libopencm3/stm32/spi.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_SPI_H
 #define LIBOPENCM3_SPI_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* Registers can be accessed as 16bit or 32bit values. */

--- a/include/libopencm3/stm32/systick.h
+++ b/include/libopencm3/stm32/systick.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_SYSTICK_H
 #define LIBOPENCM3_SYSTICK_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- SYSTICK registers --------------------------------------------------- */

--- a/include/libopencm3/stm32/timer.h
+++ b/include/libopencm3/stm32/timer.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_TIMER_H
 #define LIBOPENCM3_TIMER_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- Convenience macros -------------------------------------------------- */

--- a/include/libopencm3/stm32/tools.h
+++ b/include/libopencm3/stm32/tools.h
--- a/include/libopencm3/stm32/usart.h
+++ b/include/libopencm3/stm32/usart.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_USART_H
 #define LIBOPENCM3_USART_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- Convenience macros -------------------------------------------------- */

--- a/include/libopencm3/stm32/usb.h
+++ b/include/libopencm3/stm32/usb.h
@ -20,9 +20,9 @@
 #ifndef LIBOPENCM3_USB_H
 #define LIBOPENCM3_USB_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
-#include <stm32/tools.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/tools.h>

 /* --- USB base addresses -------------------------------------------------- */

--- a/include/libopencm3/stm32/usb_desc.h
+++ b/include/libopencm3/stm32/usb_desc.h
--- a/include/libopencm3/stm32/wwdg.h
+++ b/include/libopencm3/stm32/wwdg.h
@ -20,8 +20,8 @@
 #ifndef LIBOPENCM3_WWDG_H
 #define LIBOPENCM3_WWDG_H

-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>

 /* --- WWDG registers ------------------------------------------------------ */

--- a/include/libopencm3/usb/cdc.h
+++ b/include/libopencm3/usb/cdc.h
--- a/include/libopencm3/usb/dfu.h
+++ b/include/libopencm3/usb/dfu.h
--- a/include/libopencm3/usb/hid.h
+++ b/include/libopencm3/usb/hid.h
--- a/include/libopencm3/usb/usbd.h
+++ b/include/libopencm3/usb/usbd.h
@ -20,7 +20,7 @@
 #ifndef __USBD_H
 #define __USBD_H

-#include <usb/usbstd.h>
+#include <libopencm3/usb/usbstd.h>

 /* Static buffer for control transactions:
 * This is defined as weak in the library, applicaiton
--- a/include/libopencm3/usb/usbstd.h
+++ b/include/libopencm3/usb/usbstd.h
@ -21,7 +21,7 @@
 #define __USBSTD_H

 #include <stdint.h>
-#include <cm3/common.h>
+#include <libopencm3/cm3/common.h>

 /*
 * This file contains structure definitions for the USB control structures
--- a/lib/lpc13xx/gpio.c
+++ b/lib/lpc13xx/gpio.c
@ -17,7 +17,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <lpc13xx/gpio.h>
+#include <libopencm3/lpc13xx/gpio.h>

 void gpio_set(u32 gpioport, u16 gpios)
 {
--- a/lib/lpc13xx/libopencm3_lpc13xx.ld
+++ b/lib/lpc13xx/libopencm3_lpc13xx.ld
--- a/lib/stm32/adc.c
+++ b/lib/stm32/adc.c
@ -31,7 +31,7 @@
 *  reg16 = adc_read(ADC1, ADC_CH_0);
 */

-#include <stm32/adc.h>
+#include <libopencm3/stm32/adc.h>

 void rcc_set_adc_clk(u32 prescaler)
 {
--- a/lib/stm32/can.c
+++ b/lib/stm32/can.c
@ -17,8 +17,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include <stm32/can.h>
-#include <stm32/rcc.h>
+#include <libopencm3/stm32/can.h>
+#include <libopencm3/stm32/rcc.h>

 void can_reset(u32 canport)
 {
--- a/Show More
+++ b/Show More