aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32f1/mb525/pwmleds/pwmleds.ld
diff options
context:
space:
mode:
authorFergus Noble2011-10-13 00:11:32 -0700
committerFergus Noble2011-10-13 00:11:32 -0700
commitae44add1b6910c349917ce106d995d06da8e2879 (patch)
treeffbe01e21a4a75ec79ada4ae0c97d35c11acdfdb /examples/stm32f1/mb525/pwmleds/pwmleds.ld
parent82768447c8f262ac0ce64cf8567cea0372bf2b83 (diff)
parent8ceeb99902786041184800248eca4d7f3741d9bf (diff)
Merge branch 'stm32fx' of https://github.com/doceme/libopenstm32 into stm32f2
Conflicts: Makefile examples/stm32/lisa-m/fancyblink/fancyblink.ld examples/stm32/lisa-m/usb_hid/usbhid.ld examples/stm32/mb525/fancyblink/fancyblink.ld examples/stm32/obldc/usart_irq/usart_irq.ld examples/stm32/other/usb_dfu/usbdfu.c examples/stm32/stm32-h103/fancyblink/fancyblink.ld examples/stm32/stm32-h103/usart_irq/usart_irq.ld examples/stm32/stm32-h103/usb_dfu/usbdfu.c examples/stm32/stm32-h103/usb_hid/usbhid.ld examples/stm32f1/Makefile.include examples/stm32f1/lisa-m/fancyblink/fancyblink.ld examples/stm32f1/lisa-m/usb_hid/usbhid.ld examples/stm32f1/mb525/fancyblink/fancyblink.ld examples/stm32f1/obldc/usart_irq/usart_irq.ld examples/stm32f1/other/usb_dfu/usbdfu.c examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c examples/stm32f1/stm32-h103/usb_hid/usbhid.ld examples/stm32f2/jobygps/usart_printf/usart_printf.ld lib/lm3s/Makefile lib/lpc13xx/Makefile lib/stm32f1/Makefile
Diffstat (limited to 'examples/stm32f1/mb525/pwmleds/pwmleds.ld')
-rw-r--r--examples/stm32f1/mb525/pwmleds/pwmleds.ld2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/stm32f1/mb525/pwmleds/pwmleds.ld b/examples/stm32f1/mb525/pwmleds/pwmleds.ld
index 7ea2b92..3409b98 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