aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32
diff options
context:
space:
mode:
authorUwe Hermann2010-12-31 18:18:39 +0100
committerUwe Hermann2010-12-31 18:18:39 +0100
commit8f251e8a9d46634be4741f7f1aef3d52fb1b7dba (patch)
treefb3c17756e0b18fe19ca28f0f67b2ae636cac807 /examples/stm32
parent95793aa6cedeef06db9592602ecf3dc00edec610 (diff)
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
Diffstat (limited to 'examples/stm32')
-rw-r--r--examples/stm32/Makefile.include6
-rw-r--r--examples/stm32/lisa-m/usb_dfu/usbdfu.c12
-rw-r--r--examples/stm32/lisa-m/usb_dfu/usbdfu.ld2
-rw-r--r--examples/stm32/lisa-m/usb_hid/usbhid.c14
-rw-r--r--examples/stm32/lisa-m/usb_hid/usbhid.ld2
-rw-r--r--examples/stm32/mb525/fancyblink/fancyblink.c4
-rw-r--r--examples/stm32/mb525/fancyblink/fancyblink.ld2
-rw-r--r--examples/stm32/mb525/pwmleds/pwmleds.c6
-rw-r--r--examples/stm32/mb525/pwmleds/pwmleds.ld2
-rw-r--r--examples/stm32/obldc/can/can.c12
-rw-r--r--examples/stm32/obldc/can/can.ld2
-rw-r--r--examples/stm32/obldc/led/led.c4
-rw-r--r--examples/stm32/obldc/led/led.ld2
-rw-r--r--examples/stm32/obldc/systick/systick.c10
-rw-r--r--examples/stm32/obldc/systick/systick.ld2
-rw-r--r--examples/stm32/obldc/usart/usart.c6
-rw-r--r--examples/stm32/obldc/usart/usart.ld2
-rw-r--r--examples/stm32/obldc/usart_irq/usart_irq.c8
-rw-r--r--examples/stm32/obldc/usart_irq/usart_irq.ld2
-rw-r--r--examples/stm32/other/adc_temperature_sensor/adc.c10
-rw-r--r--examples/stm32/other/adc_temperature_sensor/adc.ld2
-rw-r--r--examples/stm32/other/dma_mem2mem/dma.c10
-rw-r--r--examples/stm32/other/dma_mem2mem/dma.ld2
-rw-r--r--examples/stm32/other/dogm128/dogm128.h6
-rw-r--r--examples/stm32/other/dogm128/main.c14
-rw-r--r--examples/stm32/other/dogm128/main.ld2
-rw-r--r--examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c10
-rw-r--r--examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld2
-rw-r--r--examples/stm32/other/i2c_stts75_sensor/stts75.c2
-rw-r--r--examples/stm32/other/rtc/rtc.c12
-rw-r--r--examples/stm32/other/rtc/rtc.ld2
-rw-r--r--examples/stm32/other/systick/systick.c10
-rw-r--r--examples/stm32/other/systick/systick.ld2
-rw-r--r--examples/stm32/other/timer_interrupt/timer.c10
-rw-r--r--examples/stm32/other/timer_interrupt/timer.ld2
-rw-r--r--examples/stm32/other/usb_cdcacm/cdcacm.c8
-rw-r--r--examples/stm32/other/usb_cdcacm/cdcacm.ld2
-rw-r--r--examples/stm32/other/usb_dfu/usbdfu.c12
-rw-r--r--examples/stm32/other/usb_dfu/usbdfu.ld2
-rw-r--r--examples/stm32/other/usb_hid/usbhid.c14
-rw-r--r--examples/stm32/other/usb_hid/usbhid.ld2
-rw-r--r--examples/stm32/stm32-h103/fancyblink/fancyblink.c4
-rw-r--r--examples/stm32/stm32-h103/fancyblink/fancyblink.ld2
-rw-r--r--examples/stm32/stm32-h103/miniblink/miniblink.c4
-rw-r--r--examples/stm32/stm32-h103/miniblink/miniblink.ld2
-rw-r--r--examples/stm32/stm32-h103/spi/spi.c4
-rw-r--r--examples/stm32/stm32-h103/spi/spi.ld2
-rw-r--r--examples/stm32/stm32-h103/usart/usart.c6
-rw-r--r--examples/stm32/stm32-h103/usart/usart.ld2
-rw-r--r--examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c8
-rw-r--r--examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld2
-rw-r--r--examples/stm32/stm32-h103/usb_dfu/usbdfu.c12
-rw-r--r--examples/stm32/stm32-h103/usb_dfu/usbdfu.ld2
-rw-r--r--examples/stm32/stm32-h103/usb_hid/usbhid.c14
-rw-r--r--examples/stm32/stm32-h103/usb_hid/usbhid.ld2
-rw-r--r--examples/stm32/stm32-h103/usb_iap/usbiap.c12
-rw-r--r--examples/stm32/stm32-h103/usb_iap/usbiap.ld2
57 files changed, 158 insertions, 160 deletions
diff --git a/examples/stm32/Makefile.include b/examples/stm32/Makefile.include
index 6594fb9..af6d02f 100644
--- 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
diff --git a/examples/stm32/lisa-m/usb_dfu/usbdfu.c b/examples/stm32/lisa-m/usb_dfu/usbdfu.c
index 2320628..2ae8374 100644
--- 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
diff --git a/examples/stm32/lisa-m/usb_dfu/usbdfu.ld b/examples/stm32/lisa-m/usb_dfu/usbdfu.ld
index 1d24b18..0841476 100644
--- 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
diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.c b/examples/stm32/lisa-m/usb_hid/usbhid.c
index aadfeaf..ffd21ac 100644
--- 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 = {
diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.ld b/examples/stm32/lisa-m/usb_hid/usbhid.ld
index f70ddee..b3483ac 100644
--- 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
diff --git a/examples/stm32/mb525/fancyblink/fancyblink.c b/examples/stm32/mb525/fancyblink/fancyblink.c
index 53bf785..65e1728 100644
--- 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)
{
diff --git a/examples/stm32/mb525/fancyblink/fancyblink.ld b/examples/stm32/mb525/fancyblink/fancyblink.ld
index abe9cea..7ea2b92 100644
--- 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
diff --git a/examples/stm32/mb525/pwmleds/pwmleds.c b/examples/stm32/mb525/pwmleds/pwmleds.c
index dc98760..db7c9ca 100644
--- 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
diff --git a/examples/stm32/mb525/pwmleds/pwmleds.ld b/examples/stm32/mb525/pwmleds/pwmleds.ld
index abe9cea..7ea2b92 100644
--- 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
diff --git a/examples/stm32/obldc/can/can.c b/examples/stm32/obldc/can/can.c
index ba53b2d..6c63c48 100644
--- 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;
diff --git a/examples/stm32/obldc/can/can.ld b/examples/stm32/obldc/can/can.ld
index 3303f26..c076521 100644
--- 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
diff --git a/examples/stm32/obldc/led/led.c b/examples/stm32/obldc/led/led.c
index 9295d02..aad055b 100644
--- 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)
diff --git a/examples/stm32/obldc/led/led.ld b/examples/stm32/obldc/led/led.ld
index 4ca199e..7899773 100644
--- 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
diff --git a/examples/stm32/obldc/systick/systick.c b/examples/stm32/obldc/systick/systick.c
index 17d35d1..3d75c4a 100644
--- 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;
diff --git a/examples/stm32/obldc/systick/systick.ld b/examples/stm32/obldc/systick/systick.ld
index e0057d9..da4f2b3 100644
--- 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
diff --git a/examples/stm32/obldc/usart/usart.c b/examples/stm32/obldc/usart/usart.c
index 0f55c26..1605a06 100644
--- 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)
{
diff --git a/examples/stm32/obldc/usart/usart.ld b/examples/stm32/obldc/usart/usart.ld
index 4ca199e..7899773 100644
--- 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
diff --git a/examples/stm32/obldc/usart_irq/usart_irq.c b/examples/stm32/obldc/usart_irq/usart_irq.c
index 0a8464f..ca8d390 100644
--- 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)
{
diff --git a/examples/stm32/obldc/usart_irq/usart_irq.ld b/examples/stm32/obldc/usart_irq/usart_irq.ld
index 4ca199e..7899773 100644
--- 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
diff --git a/examples/stm32/other/adc_temperature_sensor/adc.c b/examples/stm32/other/adc_temperature_sensor/adc.c
index 8f59767..5170bbb 100644
--- 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)
{
diff --git a/examples/stm32/other/adc_temperature_sensor/adc.ld b/examples/stm32/other/adc_temperature_sensor/adc.ld
index 3303f26..c076521 100644
--- 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
diff --git a/examples/stm32/other/dma_mem2mem/dma.c b/examples/stm32/other/dma_mem2mem/dma.c
index 37b0a3f..e43fe0d 100644
--- 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)
{
diff --git a/examples/stm32/other/dma_mem2mem/dma.ld b/examples/stm32/other/dma_mem2mem/dma.ld
index 3303f26..c076521 100644
--- 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
diff --git a/examples/stm32/other/dogm128/dogm128.h b/examples/stm32/other/dogm128/dogm128.h
index f40f4c8..ed514ab 100644
--- 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
diff --git a/examples/stm32/other/dogm128/main.c b/examples/stm32/other/dogm128/main.c
index 8d3c241..b12a36d 100644
--- 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)
diff --git a/examples/stm32/other/dogm128/main.ld b/examples/stm32/other/dogm128/main.ld
index 3303f26..c076521 100644
--- 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
diff --git a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c
index a1ba378..f70c80d 100644
--- 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)
diff --git a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
index 3303f26..c076521 100644
--- 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
diff --git a/examples/stm32/other/i2c_stts75_sensor/stts75.c b/examples/stm32/other/i2c_stts75_sensor/stts75.c
index ec51932..f28019c 100644
--- 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)
diff --git a/examples/stm32/other/rtc/rtc.c b/examples/stm32/other/rtc/rtc.c
index f762dbe..c447534 100644
--- 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)
{
diff --git a/examples/stm32/other/rtc/rtc.ld b/examples/stm32/other/rtc/rtc.ld
index abe9cea..7ea2b92 100644
--- 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
diff --git a/examples/stm32/other/systick/systick.c b/examples/stm32/other/systick/systick.c
index 44c6b7c..c05aff7 100644
--- 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;
diff --git a/examples/stm32/other/systick/systick.ld b/examples/stm32/other/systick/systick.ld
index 3303f26..c076521 100644
--- 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
diff --git a/examples/stm32/other/timer_interrupt/timer.c b/examples/stm32/other/timer_interrupt/timer.c
index 8a6eac6..aa2cdb6 100644
--- 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)
{
diff --git a/examples/stm32/other/timer_interrupt/timer.ld b/examples/stm32/other/timer_interrupt/timer.ld
index 3303f26..c076521 100644
--- 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
diff --git a/examples/stm32/other/usb_cdcacm/cdcacm.c b/examples/stm32/other/usb_cdcacm/cdcacm.c
index b885788..7748c71 100644
--- 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,
diff --git a/examples/stm32/other/usb_cdcacm/cdcacm.ld b/examples/stm32/other/usb_cdcacm/cdcacm.ld
index 0b2918e..4930394 100644
--- 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
diff --git a/examples/stm32/other/usb_dfu/usbdfu.c b/examples/stm32/other/usb_dfu/usbdfu.c
index 167f316..7933377 100644
--- 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
diff --git a/examples/stm32/other/usb_dfu/usbdfu.ld b/examples/stm32/other/usb_dfu/usbdfu.ld
index 1d24b18..0841476 100644
--- 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
diff --git a/examples/stm32/other/usb_hid/usbhid.c b/examples/stm32/other/usb_hid/usbhid.c
index 1cd27d0..87ae10d 100644
--- 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 = {
diff --git a/examples/stm32/other/usb_hid/usbhid.ld b/examples/stm32/other/usb_hid/usbhid.ld
index 0b2918e..4930394 100644
--- 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
diff --git a/examples/stm32/stm32-h103/fancyblink/fancyblink.c b/examples/stm32/stm32-h103/fancyblink/fancyblink.c
index 4291b7e..876fb2d 100644
--- 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)
diff --git a/examples/stm32/stm32-h103/fancyblink/fancyblink.ld b/examples/stm32/stm32-h103/fancyblink/fancyblink.ld
index abe9cea..7ea2b92 100644
--- 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
diff --git a/examples/stm32/stm32-h103/miniblink/miniblink.c b/examples/stm32/stm32-h103/miniblink/miniblink.c
index 6582b17..4bc781b 100644
--- 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)
{
diff --git a/examples/stm32/stm32-h103/miniblink/miniblink.ld b/examples/stm32/stm32-h103/miniblink/miniblink.ld
index abe9cea..7ea2b92 100644
--- 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
diff --git a/examples/stm32/stm32-h103/spi/spi.c b/examples/stm32/stm32-h103/spi/spi.c
index 749b756..5a36bb8 100644
--- 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)
{
diff --git a/examples/stm32/stm32-h103/spi/spi.ld b/examples/stm32/stm32-h103/spi/spi.ld
index b06cbed..25806f8 100644
--- 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
diff --git a/examples/stm32/stm32-h103/usart/usart.c b/examples/stm32/stm32-h103/usart/usart.c
index b356fdb..c3d24ca 100644
--- 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)
{
diff --git a/examples/stm32/stm32-h103/usart/usart.ld b/examples/stm32/stm32-h103/usart/usart.ld
index abe9cea..7ea2b92 100644
--- 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
diff --git a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c
index 7b12186..fa545a7 100644
--- 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,
diff --git a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
index f70ddee..b3483ac 100644
--- 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
diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/stm32-h103/usb_dfu/usbdfu.c
index 2320628..2ae8374 100644
--- 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
diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld b/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
index 1d24b18..0841476 100644
--- 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
diff --git a/examples/stm32/stm32-h103/usb_hid/usbhid.c b/examples/stm32/stm32-h103/usb_hid/usbhid.c
index 7c6068f..d11e16b 100644
--- 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 = {
diff --git a/examples/stm32/stm32-h103/usb_hid/usbhid.ld b/examples/stm32/stm32-h103/usb_hid/usbhid.ld
index f70ddee..b3483ac 100644
--- 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
diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.c b/examples/stm32/stm32-h103/usb_iap/usbiap.c
index 2320628..2ae8374 100644
--- 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
diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.ld b/examples/stm32/stm32-h103/usb_iap/usbiap.ld
index f70ddee..b3483ac 100644
--- 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