jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated to build with new libopenstm32 with f1/f2 split.

Browse Source
This commit is contained in:
Gareth McMullin 2011-10-30 13:39:19 +13:00
parent bd779aa618
commit d85a399559
8 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stm32/Makefile.inc
View File

@ -1,9 +1,9 @@
CROSS_COMPILE ?= arm-cortexm3-eabi- CROSS_COMPILE ?= arm-none-eabi-
CC = $(CROSS_COMPILE)gcc CC = $(CROSS_COMPILE)gcc
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include -mcpu=cortex-m3 -mthumb -msoft-float CFLAGS += -Istm32/include -mcpu=cortex-m3 -mthumb -msoft-float -DSTM32F1
LDFLAGS_BOOT = -lopencm3_stm32 -Wl,--defsym,_stack=0x20005000 \ LDFLAGS_BOOT = -lopencm3_stm32f1 -Wl,--defsym,_stack=0x20005000 \
-Wl,-T,stm32/blackmagic.ld -nostartfiles -lc -lnosys -Wl,-Map=mapfile \ -Wl,-T,stm32/blackmagic.ld -nostartfiles -lc -lnosys -Wl,-Map=mapfile \
-mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8002000 LDFLAGS = $(LDFLAGS_BOOT) -Wl,-Ttext=0x8002000

2
src/stm32/blackmagic.ld
View File

@ -25,5 +25,5 @@ MEMORY
} }
/* Include the common ld script from libopenstm32. */ /* Include the common ld script from libopenstm32. */
INCLUDE libopencm3_stm32.ld INCLUDE libopencm3_stm32f1.ld

8
src/stm32/cdcacm.c
View File

@ -26,11 +26,12 @@
* The device's unique id is used as the USB serial number string. * The device's unique id is used as the USB serial number string.
*/ */
#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/cdc.h> #include <libopencm3/usb/cdc.h>
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/dfu.h> #include <libopencm3/usb/dfu.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
#include <stdlib.h> #include <stdlib.h>
@ -359,7 +360,8 @@ static int cdcacm_control_request(struct usb_setup_data *req, uint8_t **buf,
return 0; return 0;
struct usb_cdc_line_coding *coding = (void*)*buf; struct usb_cdc_line_coding *coding = (void*)*buf;
usart_set_baudrate(USART1, coding->dwDTERate); usart_set_baudrate(USART1, coding->dwDTERate,
rcc_ppre2_frequency);
usart_set_databits(USART1, coding->bDataBits); usart_set_databits(USART1, coding->bDataBits);
switch(coding->bCharFormat) { switch(coding->bCharFormat) {
case 0: case 0:

2
src/stm32/jtagtap.c
View File

@ -20,7 +20,7 @@
/* This file implements the low-level JTAG TAP interface. */ /* This file implements the low-level JTAG TAP interface. */
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <stdio.h> #include <stdio.h>
#include "general.h" #include "general.h"

8
src/stm32/platform.c
View File

@ -22,10 +22,10 @@
* implementation. * implementation.
*/ */
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/systick.h> #include <libopencm3/stm32/systick.h>
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/stm32/nvic.h> #include <libopencm3/stm32/nvic.h>
#include <libopencm3/stm32/usart.h> #include <libopencm3/stm32/usart.h>
@ -201,7 +201,7 @@ void uart_init(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO9); GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO9);
/* Setup UART parameters. */ /* Setup UART parameters. */
usart_set_baudrate(USART1, 38400); usart_set_baudrate(USART1, 38400, rcc_ppre2_frequency);
usart_set_databits(USART1, 8); usart_set_databits(USART1, 8);
usart_set_stopbits(USART1, USART_STOPBITS_1); usart_set_stopbits(USART1, USART_STOPBITS_1);
usart_set_mode(USART1, USART_MODE_TX_RX); usart_set_mode(USART1, USART_MODE_TX_RX);

2
src/stm32/platform.h
View File

@ -24,7 +24,7 @@
#ifndef __PLATFORM_H #ifndef __PLATFORM_H
#define __PLATFORM_H #define __PLATFORM_H
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <setjmp.h> #include <setjmp.h>
#include <alloca.h> #include <alloca.h>

2
src/stm32/swdptap.c
View File

@ -20,7 +20,7 @@
/* This file implements the low-level SW-DP interface. */ /* This file implements the low-level SW-DP interface. */
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <stdio.h> #include <stdio.h>
#include "general.h" #include "general.h"

8
src/stm32/usbdfu.c
View File

@ -19,10 +19,10 @@
#include <string.h> #include <string.h>
#include <libopencm3/stm32/systick.h> #include <libopencm3/stm32/systick.h>
#include <libopencm3/stm32/rcc.h> #include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/stm32/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/flash.h> #include <libopencm3/stm32/f1/flash.h>
#include <libopencm3/stm32/scb.h> #include <libopencm3/stm32/f1/scb.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/dfu.h> #include <libopencm3/usb/dfu.h>