From 0677a4299bf5f26f6fbdb1ade9e092a425aebb46 Mon Sep 17 00:00:00 2001 From: hitech95 Date: Tue, 16 Nov 2021 22:48:10 +0100 Subject: [PATCH 1/4] variants: Add ldscript.ld for G0xx/G030C(6-8)T Signed-off-by: hitech95 --- variants/STM32G0xx/G030C(6-8)T/ldscript.ld | 186 +++++++++++++++++++++ 1 file changed, 186 insertions(+) create mode 100644 variants/STM32G0xx/G030C(6-8)T/ldscript.ld diff --git a/variants/STM32G0xx/G030C(6-8)T/ldscript.ld b/variants/STM32G0xx/G030C(6-8)T/ldscript.ld new file mode 100644 index 0000000000..e9be99f99d --- /dev/null +++ b/variants/STM32G0xx/G030C(6-8)T/ldscript.ld @@ -0,0 +1,186 @@ +/* +****************************************************************************** +** +** @file : LinkerScript.ld +** +** @author : Auto-generated by STM32CubeIDE +** +** @brief : Linker script for STM32G030CxTx Device from STM32G0 series +** 32/64Kbytes FLASH +** 8Kbytes RAM +** +** Set heap size, stack size and stack location according +** to application requirements. +** +** Set memory bank area and size if external memory is used +** +** Target : STMicroelectronics STM32 +** +** Distribution: The file is distributed as is, without any warranty +** of any kind. +** +****************************************************************************** +** @attention +** +**

© Copyright (c) 2021 STMicroelectronics. +** All rights reserved.

+** +** This software component is licensed by ST under BSD 3-Clause license, +** the "License"; You may not use this file except in compliance with the +** License. You may obtain a copy of the License at: +** opensource.org/licenses/BSD-3-Clause +** +****************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +_estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */ + +_Min_Heap_Size = 0x200 ; /* required amount of heap */ +_Min_Stack_Size = 0x400 ; /* required amount of stack */ + +/* Memories definition */ +MEMORY +{ + RAM (xrw) : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE + FLASH (rx) : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET +} + +/* Sections */ +SECTIONS +{ + /* The startup code into "FLASH" Rom type memory */ + .isr_vector : + { + . = ALIGN(4); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >FLASH + + /* The program code and other data into "FLASH" Rom type memory */ + .text : + { + . = ALIGN(4); + *(.text) /* .text sections (code) */ + *(.text*) /* .text* sections (code) */ + *(.glue_7) /* glue arm to thumb code */ + *(.glue_7t) /* glue thumb to arm code */ + *(.eh_frame) + + KEEP (*(.init)) + KEEP (*(.fini)) + + . = ALIGN(4); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data into "FLASH" Rom type memory */ + .rodata : + { + . = ALIGN(4); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(4); + } >FLASH + + .ARM.extab : { + . = ALIGN(4); + *(.ARM.extab* .gnu.linkonce.armextab.*) + . = ALIGN(4); + } >FLASH + + .ARM : { + . = ALIGN(4); + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + . = ALIGN(4); + } >FLASH + + .preinit_array : + { + . = ALIGN(4); + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + . = ALIGN(4); + } >FLASH + + .init_array : + { + . = ALIGN(4); + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + . = ALIGN(4); + } >FLASH + + .fini_array : + { + . = ALIGN(4); + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + . = ALIGN(4); + } >FLASH + + /* Used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections into "RAM" Ram type memory */ + .data : + { + . = ALIGN(4); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + *(.RamFunc) /* .RamFunc sections */ + *(.RamFunc*) /* .RamFunc* sections */ + + . = ALIGN(4); + _edata = .; /* define a global symbol at data end */ + + } >RAM AT> FLASH + + /* Uninitialized data section into "RAM" Ram type memory */ + . = ALIGN(4); + .bss : + { + /* This is used by the startup in order to initialize the .bss section */ + _sbss = .; /* define a global symbol at bss start */ + __bss_start__ = _sbss; + *(.bss) + *(.bss*) + *(COMMON) + + . = ALIGN(4); + _ebss = .; /* define a global symbol at bss end */ + __bss_end__ = _ebss; + } >RAM + + /* User_heap_stack section, used to check that there is enough "RAM" Ram type memory left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM + + /* Remove information from the compiler libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } +} From c3859f2092e5367275ac5c1e164cd193f2b9295c Mon Sep 17 00:00:00 2001 From: hitech95 Date: Tue, 16 Nov 2021 23:10:31 +0100 Subject: [PATCH 2/4] variants: Add generic clock for G0xx/G030C(6-8)T Signed-off-by: hitech95 --- .../STM32G0xx/G030C(6-8)T/generic_clock.c | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/variants/STM32G0xx/G030C(6-8)T/generic_clock.c b/variants/STM32G0xx/G030C(6-8)T/generic_clock.c index 25027a01ac..2624500194 100644 --- a/variants/STM32G0xx/G030C(6-8)T/generic_clock.c +++ b/variants/STM32G0xx/G030C(6-8)T/generic_clock.c @@ -20,8 +20,37 @@ */ WEAK void SystemClock_Config(void) { - /* SystemClock_Config can be generated by STM32CubeMX */ -#warning "SystemClock_Config() is empty. Default clock at reset is used." + RCC_OscInitTypeDef RCC_OscInitStruct = {}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {}; + + /* Configure the main internal regulator output voltage */ + HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1); + /* + * Initializes the RCC Oscillators according to the specified parameters + * in the RCC_OscInitTypeDef structure. + */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI; + RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.HSIDiv = RCC_HSI_DIV1; + RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; + RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI; + RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1; + RCC_OscInitStruct.PLL.PLLN = 8; + RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; + RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { + Error_Handler(); + } + /* Initializes the CPU, AHB and APB buses clocks */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) { + Error_Handler(); + } } #endif /* ARDUINO_GENERIC_* */ From 153c24186915158f19ab6ad90171e3a281421230 Mon Sep 17 00:00:00 2001 From: hitech95 Date: Tue, 16 Nov 2021 23:35:30 +0100 Subject: [PATCH 3/4] variant: Add menu entries for STM32G030CxT This patch add two chips: - STM32G030C6T - STM32G030C8T Signed-off-by: hitech95 --- README.md | 1 + boards.txt | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/README.md b/README.md index 25d1436758..519e9b9a5d 100644 --- a/README.md +++ b/README.md @@ -293,6 +293,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d | Status | Device(s) | Name | Release | Notes | | :----: | :-------: | ---- | :-----: | :---- | +| :yellow_heart: | STM32G030C6
STM32G030C8 | Generic Board | *2.2.0* | | :green_heart: | STM32G030K8 | [Aurora One](https://www.bfy.kr/aurora-one/) | *2.0.0* | | :green_heart: | STM32G030K6
STM32G030K8 | Generic Board | *2.0.0* | | | :green_heart: | STM32G031J4
STM32G031J6 | Generic Board | *2.0.0* | | diff --git a/boards.txt b/boards.txt index 1d8de58fa3..4e550cfc76 100644 --- a/boards.txt +++ b/boards.txt @@ -3190,6 +3190,22 @@ GenG0.menu.pnum.AURORA_ONE.build.product_line=STM32G030xx GenG0.menu.pnum.AURORA_ONE.build.variant=STM32G0xx/G030K(6-8)T GenG0.menu.pnum.AURORA_ONE.build.variant_h=variant_{build.board}.h +# Generic G030C6Tx +GenG0.menu.pnum.GENERIC_G030C6TX=Generic G030C6Tx +GenG0.menu.pnum.GENERIC_G030C6TX.upload.maximum_size=32768 +GenG0.menu.pnum.GENERIC_G030C6TX.upload.maximum_data_size=8192 +GenG0.menu.pnum.GENERIC_G030C6TX.build.board=GENERIC_G030C6TX +GenG0.menu.pnum.GENERIC_G030C6TX.build.product_line=STM32G030xx +GenG0.menu.pnum.GENERIC_G030C6TX.build.variant=STM32G0xx/G030C(6-8)T + +# Generic G030C8Tx +GenG0.menu.pnum.GENERIC_G030C8TX=Generic G030C8Tx +GenG0.menu.pnum.GENERIC_G030C8TX.upload.maximum_size=65536 +GenG0.menu.pnum.GENERIC_G030C8TX.upload.maximum_data_size=8192 +GenG0.menu.pnum.GENERIC_G030C8TX.build.board=GENERIC_G030C8TX +GenG0.menu.pnum.GENERIC_G030C8TX.build.product_line=STM32G030xx +GenG0.menu.pnum.GENERIC_G030C8TX.build.variant=STM32G0xx/G030C(6-8)T + # Generic G030K6Tx GenG0.menu.pnum.GENERIC_G030K6TX=Generic G030K6Tx GenG0.menu.pnum.GENERIC_G030K6TX.upload.maximum_size=32768 From b41b9bd41ee9d050d02f0c2f1c8d6bc532f31e5e Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Wed, 17 Nov 2021 14:28:14 +0100 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 519e9b9a5d..e79489a560 100644 --- a/README.md +++ b/README.md @@ -293,7 +293,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d | Status | Device(s) | Name | Release | Notes | | :----: | :-------: | ---- | :-----: | :---- | -| :yellow_heart: | STM32G030C6
STM32G030C8 | Generic Board | *2.2.0* | +| :yellow_heart: | STM32G030C6
STM32G030C8 | Generic Board | **2.2.0** | | :green_heart: | STM32G030K8 | [Aurora One](https://www.bfy.kr/aurora-one/) | *2.0.0* | | :green_heart: | STM32G030K6
STM32G030K8 | Generic Board | *2.0.0* | | | :green_heart: | STM32G031J4
STM32G031J6 | Generic Board | *2.0.0* | |