From 65b694b80b68bc4a17cabf43c1290e5af5d9f53d Mon Sep 17 00:00:00 2001 From: seeers Date: Wed, 10 Mar 2021 17:00:50 +0100 Subject: [PATCH] Add Generic F042Cx Supersede #1103 Signed-off-by: seeers Co-authored-by: Frederic.Pillon --- README.md | 1 + boards.txt | 42 ++++- variants/STM32F0xx/F042C(4-6)/generic_clock.c | 32 +++- variants/STM32F0xx/F042C(4-6)/ldscript.ld | 177 ++++++++++++++++++ 4 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 variants/STM32F0xx/F042C(4-6)/ldscript.ld diff --git a/README.md b/README.md index cab39caebd..395bf9632e 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d | :yellow_heart: | STM32F030F4 | Generic Board | **2.0.0** | | | :yellow_heart: | STM32F030R8 | Generic Board | **2.0.0** | | | :yellow_heart: | STM32F031K6T | Generic Board | **2.0.0** | | +| :yellow_heart: | STM32F042C4
STM32F042C6 | Generic Board | **2.0.0** | | | :yellow_heart: | STM32F051K6U
STM32F051K8U | Generic Board | **2.0.0** | | | :yellow_heart: | STM32F070CB | Generic Board | **2.0.0** | | | :yellow_heart: | STM32F072C8
STM32F072CB | Generic Board | **2.0.0** | | diff --git a/boards.txt b/boards.txt index 4f16ff5093..1944b58b9c 100644 --- a/boards.txt +++ b/boards.txt @@ -832,7 +832,7 @@ GenF0.build.board=GenF0 GenF0.build.mcu=cortex-m0 GenF0.build.series=STM32F0xx GenF0.build.cmsis_lib_gcc=arm_cortexM0l_math -GenF0.build.extra_flags=-D{build.product_line} {build.xSerial} +GenF0.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} # DEMO_F030F4 board GenF0.menu.pnum.DEMO_F030F4=STM32F030F4 Demo board (HSE 8Mhz) @@ -893,6 +893,38 @@ GenF0.menu.pnum.GENERIC_F031K6TX.build.board=GENERIC_F031K6TX GenF0.menu.pnum.GENERIC_F031K6TX.build.product_line=STM32F031x6 GenF0.menu.pnum.GENERIC_F031K6TX.build.variant=STM32F0xx/F031K6Tx +# Generic F042C4Tx +GenF0.menu.pnum.GENERIC_F042C4TX=Generic F042C4Tx +GenF0.menu.pnum.GENERIC_F042C4TX.upload.maximum_size=16384 +GenF0.menu.pnum.GENERIC_F042C4TX.upload.maximum_data_size=6144 +GenF0.menu.pnum.GENERIC_F042C4TX.build.board=GENERIC_F042C4TX +GenF0.menu.pnum.GENERIC_F042C4TX.build.product_line=STM32F042x6 +GenF0.menu.pnum.GENERIC_F042C4TX.build.variant=STM32F0xx/F042C(4-6) + +# Generic F042C6Tx +GenF0.menu.pnum.GENERIC_F042C6TX=Generic F042C6Tx +GenF0.menu.pnum.GENERIC_F042C6TX.upload.maximum_size=32768 +GenF0.menu.pnum.GENERIC_F042C6TX.upload.maximum_data_size=6144 +GenF0.menu.pnum.GENERIC_F042C6TX.build.board=GENERIC_F042C6TX +GenF0.menu.pnum.GENERIC_F042C6TX.build.product_line=STM32F042x6 +GenF0.menu.pnum.GENERIC_F042C6TX.build.variant=STM32F0xx/F042C(4-6) + +# Generic F042C4Ux +GenF0.menu.pnum.GENERIC_F042C4UX=Generic F042C4Ux +GenF0.menu.pnum.GENERIC_F042C4UX.upload.maximum_size=16384 +GenF0.menu.pnum.GENERIC_F042C4UX.upload.maximum_data_size=6144 +GenF0.menu.pnum.GENERIC_F042C4UX.build.board=GENERIC_F042C4UX +GenF0.menu.pnum.GENERIC_F042C4UX.build.product_line=STM32F042x6 +GenF0.menu.pnum.GENERIC_F042C4UX.build.variant=STM32F0xx/F042C(4-6) + +# Generic F042C6Ux +GenF0.menu.pnum.GENERIC_F042C6UX=Generic F042C6Ux +GenF0.menu.pnum.GENERIC_F042C6UX.upload.maximum_size=32768 +GenF0.menu.pnum.GENERIC_F042C6UX.upload.maximum_data_size=6144 +GenF0.menu.pnum.GENERIC_F042C6UX.build.board=GENERIC_F042C6UX +GenF0.menu.pnum.GENERIC_F042C6UX.build.product_line=STM32F042x6 +GenF0.menu.pnum.GENERIC_F042C6UX.build.variant=STM32F0xx/F042C(4-6) + # Generic F051K6Ux GenF0.menu.pnum.GENERIC_F051K6UX=Generic F051K6Ux GenF0.menu.pnum.GENERIC_F051K6UX.upload.maximum_size=32768 @@ -3509,6 +3541,14 @@ Eval.menu.xusb.HS.build.usb_speed=-DUSE_USB_HS Eval.menu.xusb.HSFS=High Speed in Full Speed mode Eval.menu.xusb.HSFS.build.usb_speed=-DUSE_USB_HS -DUSE_USB_HS_IN_FS +GenF0.menu.usb.none=None +GenF0.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART) +GenF0.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC +GenF0.menu.usb.CDC=CDC (no generic 'Serial') +GenF0.menu.usb.CDC.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB +GenF0.menu.usb.HID=HID (keyboard and mouse) +GenF0.menu.usb.HID.build.enable_usb={build.usb_flags} -DUSBD_USE_HID_COMPOSITE + GenF1.menu.usb.none=None GenF1.menu.usb.CDCgen=CDC (generic 'Serial' supersede U(S)ART) GenF1.menu.usb.CDCgen.build.enable_usb={build.usb_flags} -DUSBD_USE_CDC diff --git a/variants/STM32F0xx/F042C(4-6)/generic_clock.c b/variants/STM32F0xx/F042C(4-6)/generic_clock.c index 19093de0d8..0534eb3601 100644 --- a/variants/STM32F0xx/F042C(4-6)/generic_clock.c +++ b/variants/STM32F0xx/F042C(4-6)/generic_clock.c @@ -21,8 +21,36 @@ */ 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 = {}; + RCC_PeriphCLKInitTypeDef PeriphClkInit = {}; + + /** Initializes the RCC Oscillators according to the specified parameters + * in the RCC_OscInitTypeDef structure. + */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48; + RCC_OscInitStruct.HSI48State = RCC_HSI48_ON; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; + 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_HSI48; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) { + Error_Handler(); + } + PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB; + PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48; + + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) { + Error_Handler(); + } } #endif /* ARDUINO_GENERIC_* */ diff --git a/variants/STM32F0xx/F042C(4-6)/ldscript.ld b/variants/STM32F0xx/F042C(4-6)/ldscript.ld new file mode 100644 index 0000000000..014a79669b --- /dev/null +++ b/variants/STM32F0xx/F042C(4-6)/ldscript.ld @@ -0,0 +1,177 @@ +/** + ****************************************************************************** + * @file LinkerScript.ld + * @author Auto-generated by STM32CubeIDE + * @brief Linker script for STM32F042C6Tx Device from STM32F0 series + * 32Kbytes FLASH + * 6Kbytes 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 + * + *

© Copyright (c) 2020 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) } +}