diff --git a/README.md b/README.md
index a0f494024d..e2ffa20280 100644
--- a/README.md
+++ b/README.md
@@ -205,6 +205,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
| :----: | :-------: | ---- | :-----: | :---- |
| :green_heart: | STM32C011D6 | Generic Board | *2.6.0* | |
| :green_heart: | STM32C011F4
STM32C011F6 | Generic Board | *2.6.0* | |
+| :yellow_heart: | STM32C011J4
STM32C011J6 | Generic Board | **2.8.0** | |
| :green_heart: | STM32C031C4
STM32C031C6 | Generic Board | *2.5.0* | |
| :green_heart: | STM32C031F4
STM32C031F6 | Generic Board | *2.6.0* | |
diff --git a/boards.txt b/boards.txt
index 5176037595..2f3e214836 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1268,6 +1268,22 @@ GenC0.menu.pnum.GENERIC_C011F6UX.build.board=GENERIC_C011F6UX
GenC0.menu.pnum.GENERIC_C011F6UX.build.product_line=STM32C011xx
GenC0.menu.pnum.GENERIC_C011F6UX.build.variant=STM32C0xx/C011D6Y_C011F(4-6)(P-U)_C031F(4-6)P
+# Generic C011J4Mx
+GenC0.menu.pnum.GENERIC_C011J4MX=Generic C011J4Mx
+GenC0.menu.pnum.GENERIC_C011J4MX.upload.maximum_size=16384
+GenC0.menu.pnum.GENERIC_C011J4MX.upload.maximum_data_size=6144
+GenC0.menu.pnum.GENERIC_C011J4MX.build.board=GENERIC_C011J4MX
+GenC0.menu.pnum.GENERIC_C011J4MX.build.product_line=STM32C011xx
+GenC0.menu.pnum.GENERIC_C011J4MX.build.variant=STM32C0xx/C011J(4-6)M
+
+# Generic C011J6Mx
+GenC0.menu.pnum.GENERIC_C011J6MX=Generic C011J6Mx
+GenC0.menu.pnum.GENERIC_C011J6MX.upload.maximum_size=32768
+GenC0.menu.pnum.GENERIC_C011J6MX.upload.maximum_data_size=6144
+GenC0.menu.pnum.GENERIC_C011J6MX.build.board=GENERIC_C011J6MX
+GenC0.menu.pnum.GENERIC_C011J6MX.build.product_line=STM32C011xx
+GenC0.menu.pnum.GENERIC_C011J6MX.build.variant=STM32C0xx/C011J(4-6)M
+
# Generic C031C4Tx
GenC0.menu.pnum.GENERIC_C031C4TX=Generic C031C4Tx
GenC0.menu.pnum.GENERIC_C031C4TX.upload.maximum_size=16384
diff --git a/variants/STM32C0xx/C011J(4-6)M/generic_clock.c b/variants/STM32C0xx/C011J(4-6)M/generic_clock.c
index b8c94ff32c..3252c3a51f 100644
--- a/variants/STM32C0xx/C011J(4-6)M/generic_clock.c
+++ b/variants/STM32C0xx/C011J(4-6)M/generic_clock.c
@@ -20,8 +20,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_HCLK_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/C011J(4-6)M/ldscript.ld b/variants/STM32C0xx/C011J(4-6)M/ldscript.ld
new file mode 100644
index 0000000000..7084fb9aa4
--- /dev/null
+++ b/variants/STM32C0xx/C011J(4-6)M/ldscript.ld
@@ -0,0 +1,187 @@
+/*
+******************************************************************************
+**
+** @file : LinkerScript.ld
+**
+** @author : Auto-generated by STM32CubeIDE
+**
+** @brief : Linker script for STM32C011J4Mx Device from STM32C0 series
+** 16KBytes 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
+**
+** Target : STMicroelectronics STM32
+**
+** Distribution: The file is distributed as is, without any warranty
+** of any kind.
+**
+******************************************************************************
+** @attention
+**
+** Copyright (c) 2024 STMicroelectronics.
+** All rights reserved.
+**
+** This software is licensed under terms that can be found in the LICENSE file
+** in the root directory of this software component.
+** If no LICENSE file comes with this software, it is provided AS-IS.
+**
+******************************************************************************
+*/
+
+/* 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 (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+ {
+ . = ALIGN(4);
+ *(.ARM.extab* .gnu.linkonce.armextab.*)
+ . = ALIGN(4);
+ } >FLASH
+
+ .ARM (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+ {
+ . = ALIGN(4);
+ __exidx_start = .;
+ *(.ARM.exidx*)
+ __exidx_end = .;
+ . = ALIGN(4);
+ } >FLASH
+
+ .preinit_array (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+ {
+ . = ALIGN(4);
+ PROVIDE_HIDDEN (__preinit_array_start = .);
+ KEEP (*(.preinit_array*))
+ PROVIDE_HIDDEN (__preinit_array_end = .);
+ . = ALIGN(4);
+ } >FLASH
+
+ .init_array (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+ {
+ . = ALIGN(4);
+ PROVIDE_HIDDEN (__init_array_start = .);
+ KEEP (*(SORT(.init_array.*)))
+ KEEP (*(.init_array*))
+ PROVIDE_HIDDEN (__init_array_end = .);
+ . = ALIGN(4);
+ } >FLASH
+
+ .fini_array (READONLY) : /* The "READONLY" keyword is only supported in GCC11 and later, remove it if using GCC10 or earlier. */
+ {
+ . = 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) }
+}