sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

96b_carbon: Updated so that it compiles in the current codebase.

This commit is contained in:
Piotr Esden-Tempski 2022-06-03 17:49:42 -07:00
parent 9730ae1429
commit d91112e0d6
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/platforms/96b_carbon/Makefile.inc
View File

@ -5,7 +5,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include -mcpu=cortex-m4 -mthumb \ CFLAGS += -Istm32/include -mcpu=cortex-m4 -mthumb \
-mfloat-abi=hard -mfpu=fpv4-sp-d16 \ -mfloat-abi=hard -mfpu=fpv4-sp-d16 \
-DSTM32F4 -D_96B_CARBON -I../libopencm3/include \ -DSTM32F4 -D_96B_CARBON -I../libopencm3/include \
-Iplatforms/stm32 -Iplatforms/stm32 -DDFU_SERIAL_LENGTH=9
LDFLAGS = -lopencm3_stm32f4 -Wl,--defsym,_stack=0x20006000 \ LDFLAGS = -lopencm3_stm32f4 -Wl,--defsym,_stack=0x20006000 \
-Wl,-T,platforms/stm32/96b_carbon.ld -nostartfiles -lc -lnosys \ -Wl,-T,platforms/stm32/96b_carbon.ld -nostartfiles -lc -lnosys \
@ -16,11 +16,12 @@ LDFLAGS = -lopencm3_stm32f4 -Wl,--defsym,_stack=0x20006000 \
VPATH += platforms/stm32 VPATH += platforms/stm32
SRC += cdcacm.c \ SRC += cdcacm.c \
traceswodecode.c \
traceswo.c \ traceswo.c \
usbuart.c \ usbuart.c \
serialno.c \ serialno.c \
timing.c \ timing.c \
timing_stm32.c \ timing_stm32.c
all: blackmagic.bin all: blackmagic.bin

2
src/platforms/96b_carbon/platform.c
View File

@ -39,7 +39,7 @@ jmp_buf fatal_error_jmpbuf;
void platform_init(void) void platform_init(void)
{ {
rcc_clock_setup_hse_3v3(&rcc_hse_16mhz_3v3[RCC_CLOCK_3V3_48MHZ]); rcc_clock_setup_pll(&rcc_hse_16mhz_3v3[RCC_CLOCK_3V3_84MHZ]);
/* Enable peripherals */ /* Enable peripherals */
rcc_periph_clock_enable(RCC_OTGFS); rcc_periph_clock_enable(RCC_OTGFS);

31
src/platforms/96b_carbon/platform.h
View File

@ -32,11 +32,8 @@
#include <setjmp.h> #include <setjmp.h>
#define PLATFORM_HAS_TRACESWO #define PLATFORM_HAS_TRACESWO
#define BOARD_IDENT "Black Magic Probe (Carbon), (Firmware " FIRMWARE_VERSION ")" #define PLATFORM_IDENT "(Carbon)"
#define BOARD_IDENT_DFU "Black Magic (Upgrade) for Carbon, (Firmware " FIRMWARE_VERSION ")" #
#define DFU_IDENT "Black Magic Firmware Upgrade (Carbon)"
#define DFU_IFACE_STRING "@Internal Flash /0x08000000/1*016Ka,3*016Kg,1*064Kg,7*128Kg"
/* Important pin mappings for Carbon implementation: /* Important pin mappings for Carbon implementation:
* *
* LED0 = PA15 (Green USR2 : Idle)) * LED0 = PA15 (Green USR2 : Idle))
@ -100,9 +97,9 @@
* For now USART preempts USB which may spin while buffer is drained. * For now USART preempts USB which may spin while buffer is drained.
* TIM3 is used for traceswo capture and must be highest priority. * TIM3 is used for traceswo capture and must be highest priority.
*/ */
#define IRQ_PRI_USB (2 << 4) #define IRQ_PRI_USB (1 << 4)
#define IRQ_PRI_USBUSART (1 << 4) #define IRQ_PRI_USBUSART (2 << 4)
#define IRQ_PRI_USBUSART_TIM (3 << 4) #define IRQ_PRI_USBUSART_DMA (2 << 4)
#define IRQ_PRI_TRACE (0 << 4) #define IRQ_PRI_TRACE (0 << 4)
#define USBUSART USART2 #define USBUSART USART2
@ -113,11 +110,17 @@
#define USBUSART_TX_PIN GPIO2 #define USBUSART_TX_PIN GPIO2
#define USBUSART_RX_PORT GPIOA #define USBUSART_RX_PORT GPIOA
#define USBUSART_RX_PIN GPIO3 #define USBUSART_RX_PIN GPIO3
#define USBUSART_ISR usart2_isr #define USBUSART_ISR(x) usart2_isr(x)
#define USBUSART_TIM TIM4 #define USBUSART_DMA_BUS DMA1
#define USBUSART_TIM_CLK_EN() rcc_periph_clock_enable(RCC_TIM4) #define USBUSART_DMA_CLK RCC_DMA1
#define USBUSART_TIM_IRQ NVIC_TIM4_IRQ #define USBUSART_DMA_TX_CHAN DMA_STREAM6
#define USBUSART_TIM_ISR tim4_isr #define USBUSART_DMA_TX_IRQ NVIC_DMA1_STREAM6_IRQ
#define USBUSART_DMA_TX_ISR(x) dma1_stream6_isr(x)
#define USBUSART_DMA_RX_CHAN DMA_STREAM5
#define USBUSART_DMA_RX_IRQ NVIC_DMA1_STREAM5_IRQ
#define USBUSART_DMA_RX_ISR(x) dma1_stream5_isr(x)
/* For STM32F4 DMA trigger source must be specified */
#define USBUSART_DMA_TRG DMA_SxCR_CHSEL_4
#define UART_PIN_SETUP() do { \ #define UART_PIN_SETUP() do { \
gpio_mode_setup(USBUSART_TX_PORT, GPIO_MODE_AF, GPIO_PUPD_NONE, \ gpio_mode_setup(USBUSART_TX_PORT, GPIO_MODE_AF, GPIO_PUPD_NONE, \
@ -131,7 +134,7 @@
#define TRACE_TIM TIM3 #define TRACE_TIM TIM3
#define TRACE_TIM_CLK_EN() rcc_periph_clock_enable(RCC_TIM3) #define TRACE_TIM_CLK_EN() rcc_periph_clock_enable(RCC_TIM3)
#define TRACE_IRQ NVIC_TIM3_IRQ #define TRACE_IRQ NVIC_TIM3_IRQ
#define TRACE_ISR tim3_isr #define TRACE_ISR(x) tim3_isr(x)
#define DEBUG(...) #define DEBUG(...)