Skip to content

Commit 219d186

Browse files
hathachhathach
authored
Merge pull request #1034 from hathach/group-f1
Group f1
2 parents c4a9a04 + eda5b92 commit 219d186

File tree

12 files changed

+405
-77
lines changed

12 files changed

+405
-77
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
- 'samd51'
5252
- 'saml2x'
5353
- 'stm32f0'
54+
- 'stm32f1'
5455
- 'stm32f4'
5556
- 'stm32f7'
5657
- 'stm32h7'

‎docs/reference/supported.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,11 @@ ST STM32
307307
- `STM32 F070rb Nucleo <https://www.st.com/en/evaluation-tools/nucleo-f070rb.html>`__
308308
- `STM32 F072 Evaluation <https://www.st.com/en/evaluation-tools/stm32072b-eval.html>`__
309309
- `STM32 F072rb Discovery <https://www.st.com/en/evaluation-tools/32f072bdiscovery.html>`__
310-
- STM32 F103c Blue Pill
310+
- `STM32 F103c8 Blue Pill <https://stm32-base.org/boards/STM32F103C8T6-Blue-Pill>`__
311+
- `STM32 F103rc Mini v2.0 <https://stm32-base.org/boards/STM32F103RCT6-STM32-Mini-V2.0>`__
311312
- `STM32 F207zg Nucleo <https://www.st.com/en/evaluation-tools/nucleo-f207zg.html>`__
312313
- `STM32 F303vc Discovery <https://www.st.com/en/evaluation-tools/stm32f3discovery.html>`__
313-
- STM32 F401cc Black Pill
314+
- `STM32 F401cc Black Pill <https://stm32-base.org/boards/STM32F401CCU6-WeAct-Black-Pill-V1.2>`__
314315
- `STM32 F407vg Discovery <https://www.st.com/en/evaluation-tools/stm32f4discovery.html>`__
315316
- `STM32 F411ce Black Pill <https://www.adafruit.com/product/4877>`__
316317
- `STM32 F411ve Discovery <https://www.st.com/en/evaluation-tools/32f411ediscovery.html>`__

‎hw/bsp/stm32f0/family.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,13 @@ void board_init(void)
5555
// Enable UART Clock
5656
UART_CLK_EN();
5757

58+
#if CFG_TUSB_OS == OPT_OS_NONE
5859
// 1ms tick timer
5960
SysTick_Config(SystemCoreClock / 1000);
6061

61-
#if CFG_TUSB_OS == OPT_OS_FREERTOS
62+
#elif CFG_TUSB_OS == OPT_OS_FREERTOS
6263
// If freeRTOS is used, IRQ priority is limit by max syscall ( smaller is higher )
63-
NVIC_SetPriority(USB_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY );
64+
NVIC_SetPriority(USB_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY);
6465
#endif
6566

6667
// LED

‎hw/bsp/stm32f103bluepill/STM32F103XB_FLASH.ld‎ renamed to ‎hw/bsp/stm32f1/boards/stm32f103_bluepill/STM32F103X8_FLASH.ld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
4141
/* Specify the memory areas */
4242
MEMORY
4343
{
44-
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 128K
44+
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 64K
4545
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K
4646
}
4747

‎hw/bsp/stm32f1/boards/stm32f103_bluepill/board.h‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2020, Ha Thach (tinyusb.org)
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*
24+
* This file is part of the TinyUSB stack.
25+
*/
26+
27+
#ifndef BOARD_H_
28+
#define BOARD_H_
29+
30+
#ifdef __cplusplus
31+
extern "C" {
32+
#endif
33+
34+
// LED
35+
#define LED_PORT GPIOC
36+
#define LED_PIN GPIO_PIN_13
37+
#define LED_STATE_ON 0
38+
39+
// Button
40+
#define BUTTON_PORT GPIOA
41+
#define BUTTON_PIN GPIO_PIN_0
42+
#define BUTTON_STATE_ACTIVE 1
43+
44+
// UART
45+
//#define UART_DEV USART1
46+
//#define UART_CLK_EN __HAL_RCC_USART1_CLK_ENABLE
47+
//#define UART_GPIO_PORT GPIOA
48+
//#define UART_GPIO_AF GPIO_AF1_USART1
49+
//#define UART_TX_PIN GPIO_PIN_9
50+
//#define UART_RX_PIN GPIO_PIN_10
51+
52+
//--------------------------------------------------------------------+
53+
// RCC Clock
54+
//--------------------------------------------------------------------+
55+
static inline void board_stm32f1_clock_init(void)
56+
{
57+
RCC_ClkInitTypeDef clkinitstruct = {0};
58+
RCC_OscInitTypeDef oscinitstruct = {0};
59+
RCC_PeriphCLKInitTypeDef rccperiphclkinit = {0};
60+
61+
/* Enable HSE Oscillator and activate PLL with HSE as source */
62+
oscinitstruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
63+
oscinitstruct.HSEState = RCC_HSE_ON;
64+
oscinitstruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
65+
oscinitstruct.PLL.PLLMUL = RCC_PLL_MUL9;
66+
oscinitstruct.PLL.PLLState = RCC_PLL_ON;
67+
oscinitstruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
68+
HAL_RCC_OscConfig(&oscinitstruct);
69+
70+
/* USB clock selection */
71+
rccperiphclkinit.PeriphClockSelection = RCC_PERIPHCLK_USB;
72+
rccperiphclkinit.UsbClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5;
73+
HAL_RCCEx_PeriphCLKConfig(&rccperiphclkinit);
74+
75+
/* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */
76+
clkinitstruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
77+
clkinitstruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
78+
clkinitstruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
79+
clkinitstruct.APB1CLKDivider = RCC_HCLK_DIV2;
80+
clkinitstruct.APB2CLKDivider = RCC_HCLK_DIV1;
81+
HAL_RCC_ClockConfig(&clkinitstruct, FLASH_LATENCY_2);
82+
}
83+
84+
static inline void board_vbus_sense_init(void)
85+
{
86+
}
87+
88+
#ifdef __cplusplus
89+
}
90+
#endif
91+
92+
#endif /* BOARD_H_ */

‎hw/bsp/stm32f1/boards/stm32f103_bluepill/board.mk‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
CFLAGS += -DSTM32F103xB -DHSE_VALUE=8000000U
2+
3+
# All source paths should be relative to the top level.
4+
LD_FILE = $(BOARD_PATH)/STM32F103X8_FLASH.ld
5+
SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32f103xb.s
6+
7+
# For flash-jlink target
8+
JLINK_DEVICE = stm32f103c8
9+
10+
# flash target ROM bootloader
11+
flash: flash-dfu-util

‎hw/bsp/stm32f1/boards/stm32f103_mini_2/STM32F103XC_FLASH.ld‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
/*
2+
*****************************************************************************
3+
**
4+
** File : STM32F103XB_FLASH.ld
5+
**
6+
** Abstract : Linker script for STM32F103xB Device with
7+
** 128KByte FLASH, 20KByte RAM
8+
**
9+
** Set heap size, stack size and stack location according
10+
** to application requirements.
11+
**
12+
** Set memory bank area and size if external memory is used.
13+
**
14+
** Target : STMicroelectronics STM32
15+
**
16+
**
17+
** Distribution: The file is distributed as is, without any warranty
18+
** of any kind.
19+
**
20+
** (c)Copyright Ac6.
21+
** You may use this file as-is or modify it according to the needs of your
22+
** project. Distribution of this file (unmodified or modified) is not
23+
** permitted. Ac6 permit registered System Workbench for MCU users the
24+
** rights to distribute the assembled, compiled & linked contents of this
25+
** file as part of an application binary file, provided that it is built
26+
** using the System Workbench for MCU toolchain.
27+
**
28+
*****************************************************************************
29+
*/
30+
31+
/* Entry Point */
32+
ENTRY(Reset_Handler)
33+
34+
/* Highest address of the user mode stack */
35+
_estack = 0x20004FFF; /* end of RAM */
36+
37+
/* Generate a link error if heap and stack don't fit into RAM */
38+
_Min_Heap_Size = 0x200; /* required amount of heap */
39+
_Min_Stack_Size = 0x400; /* required amount of stack */
40+
41+
/* Specify the memory areas */
42+
MEMORY
43+
{
44+
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 256K
45+
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 48K
46+
}
47+
48+
/* Define output sections */
49+
SECTIONS
50+
{
51+
/* The startup code goes first into FLASH */
52+
.isr_vector :
53+
{
54+
. = ALIGN(4);
55+
KEEP(*(.isr_vector)) /* Startup code */
56+
. = ALIGN(4);
57+
} >FLASH
58+
59+
/* The program code and other data goes into FLASH */
60+
.text :
61+
{
62+
. = ALIGN(4);
63+
*(.text) /* .text sections (code) */
64+
*(.text*) /* .text* sections (code) */
65+
*(.glue_7) /* glue arm to thumb code */
66+
*(.glue_7t) /* glue thumb to arm code */
67+
*(.eh_frame)
68+
69+
KEEP (*(.init))
70+
KEEP (*(.fini))
71+
72+
. = ALIGN(4);
73+
_etext = .; /* define a global symbols at end of code */
74+
} >FLASH
75+
76+
/* Constant data goes into FLASH */
77+
.rodata :
78+
{
79+
. = ALIGN(4);
80+
*(.rodata) /* .rodata sections (constants, strings, etc.) */
81+
*(.rodata*) /* .rodata* sections (constants, strings, etc.) */
82+
. = ALIGN(4);
83+
} >FLASH
84+
85+
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
86+
.ARM : {
87+
__exidx_start = .;
88+
*(.ARM.exidx*)
89+
__exidx_end = .;
90+
} >FLASH
91+
92+
.preinit_array :
93+
{
94+
PROVIDE_HIDDEN (__preinit_array_start = .);
95+
KEEP (*(.preinit_array*))
96+
PROVIDE_HIDDEN (__preinit_array_end = .);
97+
} >FLASH
98+
.init_array :
99+
{
100+
PROVIDE_HIDDEN (__init_array_start = .);
101+
KEEP (*(SORT(.init_array.*)))
102+
KEEP (*(.init_array*))
103+
PROVIDE_HIDDEN (__init_array_end = .);
104+
} >FLASH
105+
.fini_array :
106+
{
107+
PROVIDE_HIDDEN (__fini_array_start = .);
108+
KEEP (*(SORT(.fini_array.*)))
109+
KEEP (*(.fini_array*))
110+
PROVIDE_HIDDEN (__fini_array_end = .);
111+
} >FLASH
112+
113+
/* used by the startup to initialize data */
114+
_sidata = LOADADDR(.data);
115+
116+
/* Initialized data sections goes into RAM, load LMA copy after code */
117+
.data :
118+
{
119+
. = ALIGN(4);
120+
_sdata = .; /* create a global symbol at data start */
121+
*(.data) /* .data sections */
122+
*(.data*) /* .data* sections */
123+
124+
. = ALIGN(4);
125+
_edata = .; /* define a global symbol at data end */
126+
} >RAM AT> FLASH
127+
128+
129+
/* Uninitialized data section */
130+
. = ALIGN(4);
131+
.bss :
132+
{
133+
/* This is used by the startup in order to initialize the .bss secion */
134+
_sbss = .; /* define a global symbol at bss start */
135+
__bss_start__ = _sbss;
136+
*(.bss)
137+
*(.bss*)
138+
*(COMMON)
139+
140+
. = ALIGN(4);
141+
_ebss = .; /* define a global symbol at bss end */
142+
__bss_end__ = _ebss;
143+
} >RAM
144+
145+
/* User_heap_stack section, used to check that there is enough RAM left */
146+
._user_heap_stack :
147+
{
148+
. = ALIGN(8);
149+
PROVIDE ( end = . );
150+
PROVIDE ( _end = . );
151+
. = . + _Min_Heap_Size;
152+
. = . + _Min_Stack_Size;
153+
. = ALIGN(8);
154+
} >RAM
155+
156+
157+
158+
/* Remove information from the standard libraries */
159+
/DISCARD/ :
160+
{
161+
libc.a ( * )
162+
libm.a ( * )
163+
libgcc.a ( * )
164+
}
165+
166+
.ARM.attributes 0 : { *(.ARM.attributes) }
167+
}

0 commit comments

Comments
 (0)