Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitee9c0dd

Browse files
authored
variant(f4): add generic F042K(4-6)Ux (#2648)
Signed-off-by: jackb60 <40903548+jackb60@users.noreply.github.com>
1 parentfbd3538 commitee9c0dd

File tree

4 files changed

+242
-2
lines changed

4 files changed

+242
-2
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
242242
|:green_heart:| STM32F042F4<br>STM32F042F6| Generic Board|*2.4.0*||
243243
|:green_heart:| STM32F042G4<br>STM32F042G6| Generic Board|*2.4.0*||
244244
|:green_heart:| STM32F042K4T<br>STM32F042K6T| Generic Board|**2.0.1**||
245+
|:yellow_heart:| STM32F042K4U<br>STM32F042K6U| Generic Board|**2.10.0**||
245246
|:green_heart:| STM32F042T6| Generic Board|*2.4.0*||
246247
|:green_heart:| STM32F048G6| Generic Board|*2.4.0*||
247248
|:green_heart:| STM32F048T6| Generic Board|*2.4.0*||

‎boards.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2073,6 +2073,15 @@ GenF0.menu.pnum.GENERIC_F042K4TX.build.product_line=STM32F042x6
20732073
GenF0.menu.pnum.GENERIC_F042K4TX.build.variant=STM32F0xx/F042K(4-6)T
20742074
GenF0.menu.pnum.GENERIC_F042K4TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
20752075

2076+
# Generic F042K4Ux
2077+
GenF0.menu.pnum.GENERIC_F042K4UX=Generic F042K4Ux
2078+
GenF0.menu.pnum.GENERIC_F042K4UX.upload.maximum_size=16384
2079+
GenF0.menu.pnum.GENERIC_F042K4UX.upload.maximum_data_size=6144
2080+
GenF0.menu.pnum.GENERIC_F042K4UX.build.board=GENERIC_F042K4UX
2081+
GenF0.menu.pnum.GENERIC_F042K4UX.build.product_line=STM32F042x6
2082+
GenF0.menu.pnum.GENERIC_F042K4UX.build.variant=STM32F0xx/F042K(4-6)U
2083+
GenF0.menu.pnum.GENERIC_F042K4UX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
2084+
20762085
# Generic F042K6Tx
20772086
GenF0.menu.pnum.GENERIC_F042K6TX=Generic F042K6Tx
20782087
GenF0.menu.pnum.GENERIC_F042K6TX.upload.maximum_size=32768
@@ -2082,6 +2091,15 @@ GenF0.menu.pnum.GENERIC_F042K6TX.build.product_line=STM32F042x6
20822091
GenF0.menu.pnum.GENERIC_F042K6TX.build.variant=STM32F0xx/F042K(4-6)T
20832092
GenF0.menu.pnum.GENERIC_F042K6TX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
20842093

2094+
# Generic F042K6Ux
2095+
GenF0.menu.pnum.GENERIC_F042K6UX=Generic F042K6Ux
2096+
GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_size=32768
2097+
GenF0.menu.pnum.GENERIC_F042K6UX.upload.maximum_data_size=6144
2098+
GenF0.menu.pnum.GENERIC_F042K6UX.build.board=GENERIC_F042K6UX
2099+
GenF0.menu.pnum.GENERIC_F042K6UX.build.product_line=STM32F042x6
2100+
GenF0.menu.pnum.GENERIC_F042K6UX.build.variant=STM32F0xx/F042K(4-6)U
2101+
GenF0.menu.pnum.GENERIC_F042K6UX.debug.svd_file={runtime.tools.STM32_SVD.path}/svd/STM32F0xx/STM32F0x2.svd
2102+
20852103
# Generic F042T6Yx
20862104
GenF0.menu.pnum.GENERIC_F042T6YX=Generic F042T6Yx
20872105
GenF0.menu.pnum.GENERIC_F042T6YX.upload.maximum_size=32768

‎variants/STM32F0xx/F042K(4-6)U/generic_clock.c

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,42 @@
2020
*/
2121
WEAKvoidSystemClock_Config(void)
2222
{
23-
/* SystemClock_Config can be generated by STM32CubeMX */
24-
#warning "SystemClock_Config() is empty. Default clock at reset is used."
23+
RCC_OscInitTypeDefRCC_OscInitStruct= {};
24+
RCC_ClkInitTypeDefRCC_ClkInitStruct= {};
25+
RCC_PeriphCLKInitTypeDefPeriphClkInit= {};
26+
27+
/** Initializes the RCC Oscillators according to the specified parameters
28+
* in the RCC_OscInitTypeDef structure.
29+
*/
30+
RCC_OscInitStruct.OscillatorType=RCC_OSCILLATORTYPE_HSI |RCC_OSCILLATORTYPE_HSI48;
31+
RCC_OscInitStruct.HSIState=RCC_HSI_ON;
32+
RCC_OscInitStruct.HSI48State=RCC_HSI48_ON;
33+
RCC_OscInitStruct.HSICalibrationValue=RCC_HSICALIBRATION_DEFAULT;
34+
RCC_OscInitStruct.PLL.PLLState=RCC_PLL_NONE;
35+
if (HAL_RCC_OscConfig(&RCC_OscInitStruct)!=HAL_OK) {
36+
Error_Handler();
37+
}
38+
39+
/** Initializes the CPU, AHB and APB buses clocks
40+
*/
41+
RCC_ClkInitStruct.ClockType=RCC_CLOCKTYPE_HCLK |RCC_CLOCKTYPE_SYSCLK
42+
|RCC_CLOCKTYPE_PCLK1;
43+
RCC_ClkInitStruct.SYSCLKSource=RCC_SYSCLKSOURCE_HSI48;
44+
RCC_ClkInitStruct.AHBCLKDivider=RCC_SYSCLK_DIV1;
45+
RCC_ClkInitStruct.APB1CLKDivider=RCC_HCLK_DIV1;
46+
47+
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct,FLASH_LATENCY_1)!=HAL_OK) {
48+
Error_Handler();
49+
}
50+
PeriphClkInit.PeriphClockSelection=RCC_PERIPHCLK_USB |RCC_PERIPHCLK_USART1
51+
|RCC_PERIPHCLK_I2C1;
52+
PeriphClkInit.Usart1ClockSelection=RCC_USART1CLKSOURCE_PCLK1;
53+
PeriphClkInit.I2c1ClockSelection=RCC_I2C1CLKSOURCE_HSI;
54+
PeriphClkInit.UsbClockSelection=RCC_USBCLKSOURCE_HSI48;
55+
56+
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit)!=HAL_OK) {
57+
Error_Handler();
58+
}
2559
}
2660

2761
#endif/* ARDUINO_GENERIC_* */
Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
/*
2+
******************************************************************************
3+
**
4+
** @file : LinkerScript.ld
5+
**
6+
** @author : Auto-generated by STM32CubeIDE
7+
**
8+
** @brief : Linker script for STM32F042K6Ux Device from STM32F0 series
9+
** 32KBytes FLASH
10+
** 6KBytes RAM
11+
**
12+
** Set heap size, stack size and stack location according
13+
** to application requirements.
14+
**
15+
** Set memory bank area and size if external memory is used
16+
**
17+
** Target : STMicroelectronics STM32
18+
**
19+
** Distribution: The file is distributed as is, without any warranty
20+
** of any kind.
21+
**
22+
******************************************************************************
23+
** @attention
24+
**
25+
** Copyright (c) 2025 STMicroelectronics.
26+
** All rights reserved.
27+
**
28+
** This software is licensed under terms that can be found in the LICENSE file
29+
** in the root directory of this software component.
30+
** If no LICENSE file comes with this software, it is provided AS-IS.
31+
**
32+
******************************************************************************
33+
*/
34+
35+
/* Entry Point */
36+
ENTRY(Reset_Handler)
37+
38+
/* Highest address of the user mode stack */
39+
_estack =ORIGIN(RAM) +LENGTH(RAM); /* end of "RAM" Ram type memory */
40+
41+
_Min_Heap_Size = 0x200; /* required amount of heap */
42+
_Min_Stack_Size = 0x400; /* required amount of stack */
43+
44+
/* Memories definition */
45+
MEMORY
46+
{
47+
RAM (xrw) :ORIGIN = 0x20000000,LENGTH = LD_MAX_DATA_SIZE
48+
FLASH (rx) :ORIGIN = 0x8000000 + LD_FLASH_OFFSET,LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
49+
}
50+
51+
/* Sections */
52+
SECTIONS
53+
{
54+
/* The startup code into "FLASH" Rom type memory */
55+
.isr_vector :
56+
{
57+
. =ALIGN(4);
58+
KEEP(*(.isr_vector)) /* Startup code */
59+
. =ALIGN(4);
60+
} >FLASH
61+
62+
/* The program code and other data into "FLASH" Rom type memory */
63+
.text :
64+
{
65+
. =ALIGN(4);
66+
*(.text) /* .text sections (code) */
67+
*(.text*) /* .text* sections (code) */
68+
*(.glue_7) /* glue arm to thumb code */
69+
*(.glue_7t) /* glue thumb to arm code */
70+
*(.eh_frame)
71+
72+
KEEP (*(.init))
73+
KEEP (*(.fini))
74+
75+
. =ALIGN(4);
76+
_etext = .; /* define a global symbols at end of code */
77+
} >FLASH
78+
79+
/* Constant data into "FLASH" Rom type memory */
80+
.rodata :
81+
{
82+
. =ALIGN(4);
83+
*(.rodata) /* .rodata sections (constants, strings, etc.) */
84+
*(.rodata*) /* .rodata* sections (constants, strings, etc.) */
85+
. =ALIGN(4);
86+
} >FLASH
87+
88+
.ARM.extab (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
89+
{
90+
. =ALIGN(4);
91+
*(.ARM.extab* .gnu.linkonce.armextab.*)
92+
. =ALIGN(4);
93+
} >FLASH
94+
95+
.ARM (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
96+
{
97+
. =ALIGN(4);
98+
__exidx_start = .;
99+
*(.ARM.exidx*)
100+
__exidx_end = .;
101+
. =ALIGN(4);
102+
} >FLASH
103+
104+
.preinit_array (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
105+
{
106+
. =ALIGN(4);
107+
PROVIDE_HIDDEN (__preinit_array_start = .);
108+
KEEP (*(.preinit_array*))
109+
PROVIDE_HIDDEN (__preinit_array_end = .);
110+
. =ALIGN(4);
111+
} >FLASH
112+
113+
.init_array (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
114+
{
115+
. =ALIGN(4);
116+
PROVIDE_HIDDEN (__init_array_start = .);
117+
KEEP (*(SORT(.init_array.*)))
118+
KEEP (*(.init_array*))
119+
PROVIDE_HIDDEN (__init_array_end = .);
120+
. =ALIGN(4);
121+
} >FLASH
122+
123+
.fini_array (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
124+
{
125+
. =ALIGN(4);
126+
PROVIDE_HIDDEN (__fini_array_start = .);
127+
KEEP (*(SORT(.fini_array.*)))
128+
KEEP (*(.fini_array*))
129+
PROVIDE_HIDDEN (__fini_array_end = .);
130+
. =ALIGN(4);
131+
} >FLASH
132+
133+
/* Used by the startup to initialize data */
134+
_sidata =LOADADDR(.data);
135+
136+
/* Initialized data sections into "RAM" Ram type memory */
137+
.data :
138+
{
139+
. =ALIGN(4);
140+
_sdata = .; /* create a global symbol at data start */
141+
*(.data) /* .data sections */
142+
*(.data*) /* .data* sections */
143+
*(.RamFunc) /* .RamFunc sections */
144+
*(.RamFunc*) /* .RamFunc* sections */
145+
146+
. =ALIGN(4);
147+
_edata = .; /* define a global symbol at data end */
148+
149+
} >RAM AT> FLASH
150+
151+
/* Uninitialized data section into "RAM" Ram type memory */
152+
. =ALIGN(4);
153+
.bss :
154+
{
155+
/* This is used by the startup in order to initialize the .bss section */
156+
_sbss = .; /* define a global symbol at bss start */
157+
__bss_start__ = _sbss;
158+
*(.bss)
159+
*(.bss*)
160+
*(COMMON)
161+
162+
. =ALIGN(4);
163+
_ebss = .; /* define a global symbol at bss end */
164+
__bss_end__ = _ebss;
165+
} >RAM
166+
167+
/* User_heap_stack section, used to check that there is enough "RAM" Ram type memory left */
168+
._user_heap_stack :
169+
{
170+
. =ALIGN(8);
171+
PROVIDE ( end = . );
172+
PROVIDE ( _end = . );
173+
. = . + _Min_Heap_Size;
174+
. = . + _Min_Stack_Size;
175+
. =ALIGN(8);
176+
} >RAM
177+
178+
/* Remove information from the compiler libraries */
179+
/DISCARD/ :
180+
{
181+
libc.a ( * )
182+
libm.a ( * )
183+
libgcc.a ( * )
184+
}
185+
186+
.ARM.attributes 0 : { *(.ARM.attributes) }
187+
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp