Skip to content

Commit c67883e

Browse files
seeersfpistm
andcommitted
Add Generic F042Cx
Supersede stm32duino#1103 Signed-off-by: seeers <[email protected]> Co-authored-by: Frederic.Pillon <[email protected]>
1 parent 9f17d35 commit c67883e

File tree

4 files changed

+249
-3
lines changed

4 files changed

+249
-3
lines changed

Diff for: README.md

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
157157
| :yellow_heart: | STM32F030F4 | Generic Board | **2.0.0** | |
158158
| :yellow_heart: | STM32F030R8 | Generic Board | **2.0.0** | |
159159
| :yellow_heart: | STM32F031K6T | Generic Board | **2.0.0** | |
160+
| :yellow_heart: | STM32F042C4<br>STM32F042C6 | Generic Board | **2.0.0** | |
160161
| :yellow_heart: | STM32F051K6U<br>STM32F051K8U | Generic Board | **2.0.0** | |
161162
| :yellow_heart: | STM32F070CB | Generic Board | **2.0.0** | |
162163
| :yellow_heart: | STM32F072C8<br>STM32F072CB | Generic Board | **2.0.0** | |

Diff for: boards.txt

+41-1
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ GenF0.build.board=GenF0
832832
GenF0.build.mcu=cortex-m0
833833
GenF0.build.series=STM32F0xx
834834
GenF0.build.cmsis_lib_gcc=arm_cortexM0l_math
835-
GenF0.build.extra_flags=-D{build.product_line} {build.xSerial}
835+
GenF0.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
836836

837837
# DEMO_F030F4 board
838838
GenF0.menu.pnum.DEMO_F030F4=STM32F030F4 Demo board (HSE 8Mhz)
@@ -893,6 +893,38 @@ GenF0.menu.pnum.GENERIC_F031K6TX.build.board=GENERIC_F031K6TX
893893
GenF0.menu.pnum.GENERIC_F031K6TX.build.product_line=STM32F031x6
894894
GenF0.menu.pnum.GENERIC_F031K6TX.build.variant=STM32F0xx/F031K6Tx
895895

896+
# Generic F042C4Tx
897+
GenF0.menu.pnum.GENERIC_F042C4TX=Generic F042C4Tx
898+
GenF0.menu.pnum.GENERIC_F042C4TX.upload.maximum_size=16384
899+
GenF0.menu.pnum.GENERIC_F042C4TX.upload.maximum_data_size=6144
900+
GenF0.menu.pnum.GENERIC_F042C4TX.build.board=GENERIC_F042C4TX
901+
GenF0.menu.pnum.GENERIC_F042C4TX.build.product_line=STM32F042x6
902+
GenF0.menu.pnum.GENERIC_F042C4TX.build.variant=STM32F0xx/F042C(4-6)Tx_F042C(4-6)Ux
903+
904+
# Generic F042C6Tx
905+
GenF0.menu.pnum.GENERIC_F042C6TX=Generic F042C6Tx
906+
GenF0.menu.pnum.GENERIC_F042C6TX.upload.maximum_size=32768
907+
GenF0.menu.pnum.GENERIC_F042C6TX.upload.maximum_data_size=6144
908+
GenF0.menu.pnum.GENERIC_F042C6TX.build.board=GENERIC_F042C6TX
909+
GenF0.menu.pnum.GENERIC_F042C6TX.build.product_line=STM32F042x6
910+
GenF0.menu.pnum.GENERIC_F042C6TX.build.variant=STM32F0xx/F042C(4-6)Tx_F042C(4-6)Ux
911+
912+
# Generic F042C4Ux
913+
GenF0.menu.pnum.GENERIC_F042C4UX=Generic F042C4Ux
914+
GenF0.menu.pnum.GENERIC_F042C4UX.upload.maximum_size=16384
915+
GenF0.menu.pnum.GENERIC_F042C4UX.upload.maximum_data_size=6144
916+
GenF0.menu.pnum.GENERIC_F042C4UX.build.board=GENERIC_F042C4UX
917+
GenF0.menu.pnum.GENERIC_F042C4UX.build.product_line=STM32F042x6
918+
GenF0.menu.pnum.GENERIC_F042C4UX.build.variant=STM32F0xx/F042C(4-6)Tx_F042C(4-6)Ux
919+
920+
# Generic F042C6Ux
921+
GenF0.menu.pnum.GENERIC_F042C6UX=Generic F042C6Ux
922+
GenF0.menu.pnum.GENERIC_F042C6UX.upload.maximum_size=32768
923+
GenF0.menu.pnum.GENERIC_F042C6UX.upload.maximum_data_size=6144
924+
GenF0.menu.pnum.GENERIC_F042C6UX.build.board=GENERIC_F042C6UX
925+
GenF0.menu.pnum.GENERIC_F042C6UX.build.product_line=STM32F042x6
926+
GenF0.menu.pnum.GENERIC_F042C6UX.build.variant=STM32F0xx/F042C(4-6)Tx_F042C(4-6)Ux
927+
896928
# Generic F051K6Ux
897929
GenF0.menu.pnum.GENERIC_F051K6UX=Generic F051K6Ux
898930
GenF0.menu.pnum.GENERIC_F051K6UX.upload.maximum_size=32768
@@ -3509,6 +3541,14 @@ Eval.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS
35093541
Eval.menu.xusb.HSFS=High Speed in Full Speed mode
35103542
Eval.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS
35113543

3544+
GenF0.menu.usb.none=None
3545+
GenF0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
3546+
GenF0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC
3547+
GenF0.menu.usb.CDC=CDC (no generic 'Serial')
3548+
GenF0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB
3549+
GenF0.menu.usb.HID=HID (keyboard and mouse)
3550+
GenF0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE
3551+
35123552
GenF1.menu.usb.none=None
35133553
GenF1.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART)
35143554
GenF1.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC

Diff for: variants/STM32F0xx/F042C(4-6)Tx_F042C(4-6)Ux/generic_clock.c

+30-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,36 @@
2121
*/
2222
WEAK void SystemClock_Config(void)
2323
{
24-
/* SystemClock_Config can be generated by STM32CubeMX */
25-
#warning "SystemClock_Config() is empty. Default clock at reset is used."
24+
RCC_OscInitTypeDef RCC_OscInitStruct = {};
25+
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
26+
RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
27+
28+
/** Initializes the RCC Oscillators according to the specified parameters
29+
* in the RCC_OscInitTypeDef structure.
30+
*/
31+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48;
32+
RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
33+
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
34+
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
35+
Error_Handler();
36+
}
37+
/** Initializes the CPU, AHB and APB buses clocks
38+
*/
39+
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
40+
| RCC_CLOCKTYPE_PCLK1;
41+
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI48;
42+
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
43+
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
44+
45+
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) {
46+
Error_Handler();
47+
}
48+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
49+
PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
50+
51+
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
52+
Error_Handler();
53+
}
2654
}
2755

2856
#endif /* ARDUINO_GENERIC_* */
+177
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
/**
2+
******************************************************************************
3+
* @file LinkerScript.ld
4+
* @author Auto-generated by STM32CubeIDE
5+
* @brief Linker script for STM32F042C6Tx Device from STM32F0 series
6+
* 32Kbytes FLASH
7+
* 6Kbytes 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+
* @attention
15+
*
16+
* <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
17+
* All rights reserved.</center></h2>
18+
*
19+
* This software component is licensed by ST under BSD 3-Clause license,
20+
* the "License"; You may not use this file except in compliance with the
21+
* License. You may obtain a copy of the License at:
22+
* opensource.org/licenses/BSD-3-Clause
23+
*
24+
******************************************************************************
25+
*/
26+
27+
/* Entry Point */
28+
ENTRY(Reset_Handler)
29+
30+
/* Highest address of the user mode stack */
31+
_estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
32+
33+
_Min_Heap_Size = 0x200; /* required amount of heap */
34+
_Min_Stack_Size = 0x400; /* required amount of stack */
35+
36+
/* Memories definition */
37+
MEMORY
38+
{
39+
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
40+
FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
41+
}
42+
43+
/* Sections */
44+
SECTIONS
45+
{
46+
/* The startup code into "FLASH" Rom type memory */
47+
.isr_vector :
48+
{
49+
. = ALIGN(4);
50+
KEEP(*(.isr_vector)) /* Startup code */
51+
. = ALIGN(4);
52+
} >FLASH
53+
54+
/* The program code and other data into "FLASH" Rom type memory */
55+
.text :
56+
{
57+
. = ALIGN(4);
58+
*(.text) /* .text sections (code) */
59+
*(.text*) /* .text* sections (code) */
60+
*(.glue_7) /* glue arm to thumb code */
61+
*(.glue_7t) /* glue thumb to arm code */
62+
*(.eh_frame)
63+
64+
KEEP (*(.init))
65+
KEEP (*(.fini))
66+
67+
. = ALIGN(4);
68+
_etext = .; /* define a global symbols at end of code */
69+
} >FLASH
70+
71+
/* Constant data into "FLASH" Rom type memory */
72+
.rodata :
73+
{
74+
. = ALIGN(4);
75+
*(.rodata) /* .rodata sections (constants, strings, etc.) */
76+
*(.rodata*) /* .rodata* sections (constants, strings, etc.) */
77+
. = ALIGN(4);
78+
} >FLASH
79+
80+
.ARM.extab : {
81+
. = ALIGN(4);
82+
*(.ARM.extab* .gnu.linkonce.armextab.*)
83+
. = ALIGN(4);
84+
} >FLASH
85+
86+
.ARM : {
87+
. = ALIGN(4);
88+
__exidx_start = .;
89+
*(.ARM.exidx*)
90+
__exidx_end = .;
91+
. = ALIGN(4);
92+
} >FLASH
93+
94+
.preinit_array :
95+
{
96+
. = ALIGN(4);
97+
PROVIDE_HIDDEN (__preinit_array_start = .);
98+
KEEP (*(.preinit_array*))
99+
PROVIDE_HIDDEN (__preinit_array_end = .);
100+
. = ALIGN(4);
101+
} >FLASH
102+
103+
.init_array :
104+
{
105+
. = ALIGN(4);
106+
PROVIDE_HIDDEN (__init_array_start = .);
107+
KEEP (*(SORT(.init_array.*)))
108+
KEEP (*(.init_array*))
109+
PROVIDE_HIDDEN (__init_array_end = .);
110+
. = ALIGN(4);
111+
} >FLASH
112+
113+
.fini_array :
114+
{
115+
. = ALIGN(4);
116+
PROVIDE_HIDDEN (__fini_array_start = .);
117+
KEEP (*(SORT(.fini_array.*)))
118+
KEEP (*(.fini_array*))
119+
PROVIDE_HIDDEN (__fini_array_end = .);
120+
. = ALIGN(4);
121+
} >FLASH
122+
123+
/* Used by the startup to initialize data */
124+
_sidata = LOADADDR(.data);
125+
126+
/* Initialized data sections into "RAM" Ram type memory */
127+
.data :
128+
{
129+
. = ALIGN(4);
130+
_sdata = .; /* create a global symbol at data start */
131+
*(.data) /* .data sections */
132+
*(.data*) /* .data* sections */
133+
*(.RamFunc) /* .RamFunc sections */
134+
*(.RamFunc*) /* .RamFunc* sections */
135+
136+
. = ALIGN(4);
137+
_edata = .; /* define a global symbol at data end */
138+
139+
} >RAM AT> FLASH
140+
141+
/* Uninitialized data section into "RAM" Ram type memory */
142+
. = ALIGN(4);
143+
.bss :
144+
{
145+
/* This is used by the startup in order to initialize the .bss section */
146+
_sbss = .; /* define a global symbol at bss start */
147+
__bss_start__ = _sbss;
148+
*(.bss)
149+
*(.bss*)
150+
*(COMMON)
151+
152+
. = ALIGN(4);
153+
_ebss = .; /* define a global symbol at bss end */
154+
__bss_end__ = _ebss;
155+
} >RAM
156+
157+
/* User_heap_stack section, used to check that there is enough "RAM" Ram type memory left */
158+
._user_heap_stack :
159+
{
160+
. = ALIGN(8);
161+
PROVIDE ( end = . );
162+
PROVIDE ( _end = . );
163+
. = . + _Min_Heap_Size;
164+
. = . + _Min_Stack_Size;
165+
. = ALIGN(8);
166+
} >RAM
167+
168+
/* Remove information from the compiler libraries */
169+
/DISCARD/ :
170+
{
171+
libc.a ( * )
172+
libm.a ( * )
173+
libgcc.a ( * )
174+
}
175+
176+
.ARM.attributes 0 : { *(.ARM.attributes) }
177+
}

0 commit comments

Comments
 (0)