Skip to content

Commit 82a94ea

Browse files
authored
Add f303 to tinyuf2 bootloader support (#19620)
1 parent dcd5328 commit 82a94ea

File tree

3 files changed

+95
-3
lines changed

3 files changed

+95
-3
lines changed

builddefs/mcu_selection.mk

+5-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,11 @@ ifneq ($(findstring STM32F303, $(MCU)),)
313313
# Linker script to use
314314
# - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
315315
# or <keyboard_dir>/ld/
316-
MCU_LDSCRIPT ?= STM32F303xC
316+
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
317+
MCU_LDSCRIPT ?= STM32F303xC_tinyuf2
318+
else
319+
MCU_LDSCRIPT ?= STM32F303xC
320+
endif
317321

318322
# Startup code to use
319323
# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/

docs/flashing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ Flashing sequence:
324324

325325
## tinyuf2
326326

327-
Keyboards may opt into supporting the tinyuf2 bootloader. This is currently only supported on the F401/F411 blackpill.
327+
Keyboards may opt into supporting the tinyuf2 bootloader. This is currently only supported on F303/F401/F411.
328328

329329
The `rules.mk` setting for this bootloader is `tinyuf2`, and can be specified at the keymap or user level.
330330

@@ -365,7 +365,7 @@ CLI Flashing sequence:
365365

366366
## uf2boot
367367

368-
Keyboards may opt into supporting the uf2boot bootloader. This is currently only supported on the F103 bluepill.
368+
Keyboards may opt into supporting the uf2boot bootloader. This is currently only supported on F103.
369369

370370
The `rules.mk` setting for this bootloader is `uf2boot`, and can be specified at the keymap or user level.
371371

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
/*
2+
ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
/*
18+
* STM32F303xC memory setup.
19+
*/
20+
MEMORY
21+
{
22+
flash0 (rx) : org = 0x08000000 + 16k, len = 256k - 16k
23+
flash1 (rx) : org = 0x00000000, len = 0
24+
flash2 (rx) : org = 0x00000000, len = 0
25+
flash3 (rx) : org = 0x00000000, len = 0
26+
flash4 (rx) : org = 0x00000000, len = 0
27+
flash5 (rx) : org = 0x00000000, len = 0
28+
flash6 (rx) : org = 0x00000000, len = 0
29+
flash7 (rx) : org = 0x00000000, len = 0
30+
ram0 (wx) : org = 0x20000000, len = 40k
31+
ram1 (wx) : org = 0x00000000, len = 0
32+
ram2 (wx) : org = 0x00000000, len = 0
33+
ram3 (wx) : org = 0x00000000, len = 0
34+
ram4 (wx) : org = 0x10000000, len = 8k
35+
ram5 (wx) : org = 0x00000000, len = 0
36+
ram6 (wx) : org = 0x00000000, len = 0
37+
ram7 (wx) : org = 0x00000000, len = 0
38+
}
39+
40+
/* For each data/text section two region are defined, a virtual region
41+
and a load region (_LMA suffix).*/
42+
43+
/* Flash region to be used for exception vectors.*/
44+
REGION_ALIAS("VECTORS_FLASH", flash0);
45+
REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
46+
47+
/* Flash region to be used for constructors and destructors.*/
48+
REGION_ALIAS("XTORS_FLASH", flash0);
49+
REGION_ALIAS("XTORS_FLASH_LMA", flash0);
50+
51+
/* Flash region to be used for code text.*/
52+
REGION_ALIAS("TEXT_FLASH", flash0);
53+
REGION_ALIAS("TEXT_FLASH_LMA", flash0);
54+
55+
/* Flash region to be used for read only data.*/
56+
REGION_ALIAS("RODATA_FLASH", flash0);
57+
REGION_ALIAS("RODATA_FLASH_LMA", flash0);
58+
59+
/* Flash region to be used for various.*/
60+
REGION_ALIAS("VARIOUS_FLASH", flash0);
61+
REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
62+
63+
/* Flash region to be used for RAM(n) initialization data.*/
64+
REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
65+
66+
/* RAM region to be used for Main stack. This stack accommodates the processing
67+
of all exceptions and interrupts.*/
68+
REGION_ALIAS("MAIN_STACK_RAM", ram0);
69+
70+
/* RAM region to be used for the process stack. This is the stack used by
71+
the main() function.*/
72+
REGION_ALIAS("PROCESS_STACK_RAM", ram0);
73+
74+
/* RAM region to be used for data segment.*/
75+
REGION_ALIAS("DATA_RAM", ram0);
76+
REGION_ALIAS("DATA_RAM_LMA", flash0);
77+
78+
/* RAM region to be used for BSS segment.*/
79+
REGION_ALIAS("BSS_RAM", ram0);
80+
81+
/* RAM region to be used for the default heap.*/
82+
REGION_ALIAS("HEAP_RAM", ram0);
83+
84+
/* Generic rules inclusion.*/
85+
INCLUDE rules.ld
86+
87+
/* TinyUF2 bootloader reset support */
88+
_board_dfu_dbl_tap = ORIGIN(ram0) + 40k - 4; /* this is based off the linker file for tinyuf2 */

0 commit comments

Comments
 (0)