variant(C0): add C031C(4-6)(T-U) generic support

fpistm · fpistm · commit 17ce259a835e · 2023-01-20T15:52:45.000+01:00
Note: SystemClock_Config() is based on LL to spare a maximum
memory

Signed-off-by: Alexandre Bourdiol &lt;alexandre.bourdiol@st.com&gt;
diff --git a/README.md b/README.md
@@ -56,6 +56,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
  - [Discovery boards](#discovery-boards)
  - [Eval boards](#eval-boards)
  - [STM32MP1 series coprocessor boards](#stm32mp1-series-coprocessor-boards)
+ - [Generic STM32C0 boards](#generic-stm32c0-boards)
  - [Generic STM32F0 boards](#generic-stm32f0-boards)
  - [Generic STM32F1 boards](#generic-stm32f1-boards)
  - [Generic STM32F2 boards](#generic-stm32f2-boards)
@@ -176,6 +177,12 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | :green_heart:  | STM32MP157A | [STM32MP157A-DK1](https://www.st.com/en/evaluation-tools/stm32mp157a-dk1.html) | *1.8.0* | See [the documentation](https://github.com/stm32duino/Arduino_Core_STM32/tree/main/variants/STM32MP157_DK/README.md) to use this board|
 | :green_heart:  | STM32MP157C | [STM32MP157C-DK2](https://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html) | *1.8.0* | See [the documentation](https://github.com/stm32duino/Arduino_Core_STM32/tree/main/variants/STM32MP157_DK/README.md) to use this board|
 
+### Generic STM32C0 boards
+
+| Status | Device(s) | Name | Release | Notes |
+| :----: | :-------: | ---- | :-----: | :---- |
+| :yellow_heart: | STM32C031C4<br>STM32C031C6 | Generic Board | **2.5.0** |  |
+
 ### Generic STM32F0 boards
 
 | Status | Device(s) | Name | Release | Notes |
diff --git a/boards.txt b/boards.txt
@@ -1090,6 +1090,60 @@ STM32MP1.menu.upload_method.MassStorage=Generate run_arduino.sh (You need to cop
 STM32MP1.menu.upload_method.MassStorage.upload.protocol=
 STM32MP1.menu.upload_method.MassStorage.upload.tool=remoteproc_gen
 
+###############################
+# Generic C0
+GenC0.name=Generic STM32C0 series
+
+GenC0.build.core=arduino
+GenC0.build.board=GenC0
+GenC0.build.mcu=cortex-m0plus
+GenC0.build.series=STM32C0xx
+GenC0.build.cmsis_lib_gcc=arm_cortexM0l_math
+GenC0.build.extra_flags=-D{build.product_line} {build.xSerial} -D__CORTEX_SC=0
+
+# Generic C031C4Tx
+GenC0.menu.pnum.GENERIC_C031C4TX=Generic C031C4Tx
+GenC0.menu.pnum.GENERIC_C031C4TX.upload.maximum_size=16384
+GenC0.menu.pnum.GENERIC_C031C4TX.upload.maximum_data_size=12288
+GenC0.menu.pnum.GENERIC_C031C4TX.build.board=GENERIC_C031C4TX
+GenC0.menu.pnum.GENERIC_C031C4TX.build.product_line=STM32C031xx
+GenC0.menu.pnum.GENERIC_C031C4TX.build.variant=STM32C0xx/C031C(4-6)(T-U)
+
+# Generic C031C6Tx
+GenC0.menu.pnum.GENERIC_C031C6TX=Generic C031C6Tx
+GenC0.menu.pnum.GENERIC_C031C6TX.upload.maximum_size=32768
+GenC0.menu.pnum.GENERIC_C031C6TX.upload.maximum_data_size=12288
+GenC0.menu.pnum.GENERIC_C031C6TX.build.board=GENERIC_C031C6TX
+GenC0.menu.pnum.GENERIC_C031C6TX.build.product_line=STM32C031xx
+GenC0.menu.pnum.GENERIC_C031C6TX.build.variant=STM32C0xx/C031C(4-6)(T-U)
+
+# Generic C031C4Ux
+GenC0.menu.pnum.GENERIC_C031C4UX=Generic C031C4Ux
+GenC0.menu.pnum.GENERIC_C031C4UX.upload.maximum_size=16384
+GenC0.menu.pnum.GENERIC_C031C4UX.upload.maximum_data_size=12288
+GenC0.menu.pnum.GENERIC_C031C4UX.build.board=GENERIC_C031C4UX
+GenC0.menu.pnum.GENERIC_C031C4UX.build.product_line=STM32C031xx
+GenC0.menu.pnum.GENERIC_C031C4UX.build.variant=STM32C0xx/C031C(4-6)(T-U)
+
+# Generic C031C6Ux
+GenC0.menu.pnum.GENERIC_C031C6UX=Generic C031C6Ux
+GenC0.menu.pnum.GENERIC_C031C6UX.upload.maximum_size=32768
+GenC0.menu.pnum.GENERIC_C031C6UX.upload.maximum_data_size=12288
+GenC0.menu.pnum.GENERIC_C031C6UX.build.board=GENERIC_C031C6UX
+GenC0.menu.pnum.GENERIC_C031C6UX.build.product_line=STM32C031xx
+GenC0.menu.pnum.GENERIC_C031C6UX.build.variant=STM32C0xx/C031C(4-6)(T-U)
+
+# Upload menu
+GenC0.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
+GenC0.menu.upload_method.swdMethod.upload.protocol=0
+GenC0.menu.upload_method.swdMethod.upload.options=-g
+GenC0.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
+
+GenC0.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
+GenC0.menu.upload_method.serialMethod.upload.protocol=1
+GenC0.menu.upload_method.serialMethod.upload.options={serial.port.file} -s
+GenC0.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
+
 ###############################
 # Generic F0
 GenF0.name=Generic STM32F0 series
@@ -10500,6 +10554,12 @@ STM32MP1.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NO
 STM32MP1.menu.xserial.disabled=Disabled (no Serial support)
 STM32MP1.menu.xserial.disabled.build.xSerial=
 
+GenC0.menu.xserial.generic=Enabled (generic 'Serial')
+GenC0.menu.xserial.none=Enabled (no generic 'Serial')
+GenC0.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
+GenC0.menu.xserial.disabled=Disabled (no Serial support)
+GenC0.menu.xserial.disabled.build.xSerial=
+
 GenF0.menu.xserial.generic=Enabled (generic 'Serial')
 GenF0.menu.xserial.none=Enabled (no generic 'Serial')
 GenF0.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
@@ -11088,6 +11148,24 @@ STM32MP1.menu.opt.ogstd.build.flags.optimize=-Og
 STM32MP1.menu.opt.o0std=No Optimization (-O0)
 STM32MP1.menu.opt.o0std.build.flags.optimize=-O0
 
+GenC0.menu.opt.osstd=Smallest (-Os default)
+GenC0.menu.opt.oslto=Smallest (-Os) with LTO
+GenC0.menu.opt.oslto.build.flags.optimize=-Os -flto
+GenC0.menu.opt.o1std=Fast (-O1)
+GenC0.menu.opt.o1std.build.flags.optimize=-O1
+GenC0.menu.opt.o1lto=Fast (-O1) with LTO
+GenC0.menu.opt.o1lto.build.flags.optimize=-O1 -flto
+GenC0.menu.opt.o2std=Faster (-O2)
+GenC0.menu.opt.o2std.build.flags.optimize=-O2
+GenC0.menu.opt.o2lto=Faster (-O2) with LTO
+GenC0.menu.opt.o2lto.build.flags.optimize=-O2 -flto
+GenC0.menu.opt.o3std=Fastest (-O3)
+GenC0.menu.opt.o3std.build.flags.optimize=-O3
+GenC0.menu.opt.o3lto=Fastest (-O3) with LTO
+GenC0.menu.opt.o3lto.build.flags.optimize=-O3 -flto
+GenC0.menu.opt.ogstd=Debug (-Og)
+GenC0.menu.opt.ogstd.build.flags.optimize=-Og
+
 GenF0.menu.opt.osstd=Smallest (-Os default)
 GenF0.menu.opt.oslto=Smallest (-Os) with LTO
 GenF0.menu.opt.oslto.build.flags.optimize=-Os -flto
@@ -11618,6 +11696,10 @@ STM32MP1.menu.dbg.enable_log.build.flags.debug=
 STM32MP1.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
 STM32MP1.menu.dbg.enable_all.build.flags.debug=-g
 
+GenC0.menu.dbg.none=None
+GenC0.menu.dbg.enable=Enabled (-g)
+GenC0.menu.dbg.enable.build.flags.debug=-g
+
 GenF0.menu.dbg.none=None
 GenF0.menu.dbg.enable_sym=Symbols Enabled (-g)
 GenF0.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
@@ -11863,6 +11945,16 @@ STM32MP1.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_fl
 STM32MP1.menu.rtlib.full=Newlib Standard
 STM32MP1.menu.rtlib.full.build.flags.ldspecs=
 
+GenC0.menu.rtlib.nano=Newlib Nano (default)
+GenC0.menu.rtlib.nanofp=Newlib Nano + Float Printf
+GenC0.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
+GenC0.menu.rtlib.nanofs=Newlib Nano + Float Scanf
+GenC0.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
+GenC0.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
+GenC0.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
+GenC0.menu.rtlib.full=Newlib Standard
+GenC0.menu.rtlib.full.build.flags.ldspecs=
+
 GenF0.menu.rtlib.nano=Newlib Nano (default)
 GenF0.menu.rtlib.nanofp=Newlib Nano + Float Printf
 GenF0.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
diff --git a/variants/STM32C0xx/C031C(4-6)(T-U)/generic_clock.c b/variants/STM32C0xx/C031C(4-6)(T-U)/generic_clock.c
@@ -13,6 +13,7 @@
 #if defined(ARDUINO_GENERIC_C031C4TX) || defined(ARDUINO_GENERIC_C031C4UX) ||\
     defined(ARDUINO_GENERIC_C031C6TX) || defined(ARDUINO_GENERIC_C031C6UX)
 #include "pins_arduino.h"
+#include "stm32yyxx_ll_utils.h"
 
 /**
   * @brief  System Clock Configuration
@@ -21,8 +22,32 @@
   */
 WEAK void SystemClock_Config(void)
 {
-  /* SystemClock_Config can be generated by STM32CubeMX */
-#warning "SystemClock_Config() is empty. Default clock at reset is used."
+  LL_FLASH_SetLatency(LL_FLASH_LATENCY_1);
+
+  /* HSI configuration and activation */
+  LL_RCC_HSI_Enable();
+  while (LL_RCC_HSI_IsReady() != 1) {
+  }
+
+  LL_RCC_HSI_SetCalibTrimming(64);
+  LL_RCC_SetHSIDiv(LL_RCC_HSI_DIV_1);
+  /* Set AHB prescaler*/
+  LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
+
+  /* Sysclk activation on the HSI */
+  LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_HSI);
+  while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_HSI) {
+  }
+
+  /* Set APB1 prescaler*/
+  LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
+  /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */
+  LL_SetSystemCoreClock(48000000);
+
+  /* Update the time base */
+  if (HAL_InitTick(TICK_INT_PRIORITY) != HAL_OK) {
+    Error_Handler();
+  }
 }
 
 #endif /* ARDUINO_GENERIC_* */
diff --git a/variants/STM32C0xx/C031C(4-6)(T-U)/ldscript.ld b/variants/STM32C0xx/C031C(4-6)(T-U)/ldscript.ld
@@ -0,0 +1,177 @@
+/**
+ ******************************************************************************
+ * @file      LinkerScript.ld
+ * @author    Auto-generated by STM32CubeIDE
+ *  Abstract    : Linker script for STM32C031CxTx Device from stm32c0 series
+ *                      32Kbytes FLASH
+ *                      12Kbytes RAM
+ *
+ *            Set heap size, stack size and stack location according
+ *            to application requirements.
+ *
+ *            Set memory bank area and size if external memory is used
+ ******************************************************************************
+ * @attention
+ *
+ * <h2><center>&copy; Copyright (c) 2020 STMicroelectronics.
+ * All rights reserved.</center></h2>
+ *
+ * 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) }
+}
