Skip to content

Commit eceb281

Browse files
committed
Merge branch 'master' into fork/ennebi/mtp
2 parents 13c2401 + 43e6c9d commit eceb281

File tree

19 files changed

+1717
-29
lines changed

19 files changed

+1717
-29
lines changed

.github/workflows/ci_set_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"stm32h7 stm32h7rs": ["arm-gcc", "arm-clang", "arm-iar"],
4545
"stm32l0 stm32l4": ["arm-gcc", "arm-clang", "arm-iar"],
4646
"stm32n6": ["arm-gcc"],
47-
"stm32u5 stm32wb": ["arm-gcc", "arm-clang", "arm-iar"],
47+
"stm32u0 stm32u5 stm32wb": ["arm-gcc", "arm-clang", "arm-iar"],
4848
"stm32wba": ["arm-gcc", "arm-clang"],
4949
"xmc4000": ["arm-gcc"],
5050
"-bespressif_s2_devkitc": ["esp-idf"],

README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ Supported CPUs
212212
| +----+------------------------+--------+------+-----------+------------------------+-------------------+
213213
| | N6 |||| dwc2 | |
214214
| +----+------------------------+--------+------+-----------+------------------------+-------------------+
215+
| | U0 |||| stm32_fsdev | |
216+
| +----+------------------------+--------+------+-----------+------------------------+-------------------+
215217
| | U5 | 535, 545 || || stm32_fsdev | |
216218
| | +------------------------+--------+------+-----------+------------------------+-------------------+
217219
| | | 575, 585 |||| dwc2 | |

docs/reference/boards.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ stm32l4r5nucleo STM32 L4R5 Nucleo stm32l4 https://www.s
299299
stm32n6570dk STM32 N6570-DK stm32n6 https://www.st.com/en/evaluation-tools/stm32n6570-dk.html
300300
stm32n657nucleo STM32 N657X0-Q Nucleo stm32n6 https://www.st.com/en/evaluation-tools/nucleo-n657x0-q.html
301301
b_u585i_iot2a STM32 B-U585i IOT2A Discovery kit stm32u5 https://www.st.com/en/evaluation-tools/b-u585i-iot02a.html
302+
stm32u083cdk STM32 U083C Discovery Kit stm32u0 https://www.st.com/en/evaluation-tools/stm32u083c-dk.html
302303
stm32u545nucleo STM32 U545 Nucleo stm32u5 https://www.st.com/en/evaluation-tools/nucleo-u545re-q.html
303304
stm32u575eval STM32 U575 Eval stm32u5 https://www.st.com/en/evaluation-tools/stm32u575i-ev.html
304305
stm32u575nucleo STM32 U575 Nucleo stm32u5 https://www.st.com/en/evaluation-tools/nucleo-u575zi-q.html

examples/build_system/make/make.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ endif
134134
ifeq ($(LOGGER),rtt)
135135
CFLAGS += -DLOGGER_RTT
136136
#CFLAGS += -DSEGGER_RTT_MODE_DEFAULT=SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
137-
INC += $(TOP)/$(lib/SEGGER_RTT)/RTT
138-
SRC_C += $(lib/SEGGER_RTT)/RTT/SEGGER_RTT.c
137+
INC += $(TOP)/lib/SEGGER_RTT/RTT
138+
SRC_C += lib/SEGGER_RTT/RTT/SEGGER_RTT.c
139139
endif
140140
ifeq ($(LOGGER),swo)
141141
CFLAGS += -DLOGGER_SWO
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"version": 6,
3+
"include": [
4+
"../../../hw/bsp/BoardPresets.json"
5+
]
6+
}

0 commit comments

Comments
 (0)