Add ch32v203g6 evt, correct define linker script flash size, ram size for variants (openwch#128)

* allow to define linker: flash_size, ram_size (and stack size), correctly define these using maximum_size and maximum_data_size

* - fix v203C6 RAM size, correct is 10K
- add new variant v203G6 EVT

Author: hathach

boards.txt

@@ -460,6 +460,22 @@ CH32V20x_EVT.menu.pnum.CH32V203G8.build.math_lib_gcc=-lm
 CH32V20x_EVT.menu.pnum.CH32V203G8.build.IQ_math_RV32=
 CH32V20x_EVT.menu.pnum.CH32V203G8.build.ch_extra_lib=-lprintf
 
+#CH32V203G6 EVT Board
+CH32V20x_EVT.menu.pnum.CH32V203G6=CH32V203G6 EVT
+CH32V20x_EVT.menu.pnum.CH32V203G6.node=NODE_V203G6
+CH32V20x_EVT.menu.pnum.CH32V203G6.upload.maximum_size=32768
+CH32V20x_EVT.menu.pnum.CH32V203G6.upload.maximum_data_size=10240
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.mcu=QingKe-V4B
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.board=CH32V203G6
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.series=CH32V20x
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.variant=CH32V20x/CH32V203G6
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.chip=CH32V203
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.march=rv32imacxw
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.mabi=ilp32
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.math_lib_gcc=-lm
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.IQ_math_RV32=
+CH32V20x_EVT.menu.pnum.CH32V203G6.build.ch_extra_lib=-lprintf
+
 #CH32V203C8 Board
 CH32V20x_EVT.menu.pnum.CH32V203C8=CH32V203C8
 CH32V20x_EVT.menu.pnum.CH32V203C8.node=NODE_V203C8
@@ -480,7 +496,7 @@ CH32V20x_EVT.menu.pnum.CH32V203C8.build.ch_extra_lib=-lprintf
 CH32V20x_EVT.menu.pnum.CH32V203C6=CH32V203C6
 CH32V20x_EVT.menu.pnum.CH32V203C6.node=NODE_V203C6
 CH32V20x_EVT.menu.pnum.CH32V203C6.upload.maximum_size=32768
-CH32V20x_EVT.menu.pnum.CH32V203C6.upload.maximum_data_size=20480
+CH32V20x_EVT.menu.pnum.CH32V203C6.upload.maximum_data_size=10240
 CH32V20x_EVT.menu.pnum.CH32V203C6.build.mcu=QingKe-V4B
 CH32V20x_EVT.menu.pnum.CH32V203C6.build.board=CH32V203C6
 CH32V20x_EVT.menu.pnum.CH32V203C6.build.series=CH32V20x

platform.txt

@@ -65,7 +65,7 @@ build.variant_h=
 
 # These can be overridden in platform.local.txt
 compiler.c.extra_flags=
-compiler.c.elf.extra_flags=
+compiler.c.elf.extra_flags=-Wl,--defsym=__FLASH_SIZE={upload.maximum_size} -Wl,--defsym=__RAM_SIZE={upload.maximum_data_size}
 compiler.cpp.extra_flags=
 compiler.cpp.std=gnu++14
 compiler.S.extra_flags=

system/CH32V20x/SRC/Ld/Link.ld

@@ -1 +1 @@
-ENTRY( _start )__stack_size = 2048;PROVIDE( _stack_size = __stack_size );MEMORY{  /* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203K6-CH32V203C6 *//*	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 32K	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10K*/ /* CH32V20x_D6 - CH32V203K8-CH32V203C8-CH32V203G8-CH32V203F8 *//**/	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 64K	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K   /* CH32V20x_D8 - CH32V203RB   CH32V20x_D8W - CH32V208x   FLASH + RAM supports the following configuration   FLASH-128K + RAM-64K   FLASH-144K + RAM-48K   FLASH-160K + RAM-32K	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 160K	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 32K*/}SECTIONS{	.init :	{		_sinit = .;		. = ALIGN(4);		KEEP(*(SORT_NONE(.init)))		. = ALIGN(4);		_einit = .;	} >FLASH AT>FLASH  .vector :  {      *(.vector);	  . = ALIGN(64);  } >FLASH AT>FLASH	.text :	{		. = ALIGN(4);		*(.text)		*(.text.*)		*(.rodata)		*(.rodata*)		*(.gnu.linkonce.t.*)		. = ALIGN(4);	} >FLASH AT>FLASH 	.fini :	{		KEEP(*(SORT_NONE(.fini)))		. = ALIGN(4);	} >FLASH AT>FLASH	PROVIDE( _etext = . );	PROVIDE( _eitcm = . );		.preinit_array  :	{	  PROVIDE_HIDDEN (__preinit_array_start = .);	  KEEP (*(.preinit_array))	  PROVIDE_HIDDEN (__preinit_array_end = .);	} >FLASH AT>FLASH 		.init_array     :	{	  PROVIDE_HIDDEN (__init_array_start = .);	  KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))	  KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))	  PROVIDE_HIDDEN (__init_array_end = .);	} >FLASH AT>FLASH 		.fini_array     :	{	  PROVIDE_HIDDEN (__fini_array_start = .);	  KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))	  KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))	  PROVIDE_HIDDEN (__fini_array_end = .);	} >FLASH AT>FLASH 		.ctors          :	{	  /* gcc uses crtbegin.o to find the start of	     the constructors, so we make sure it is	     first.  Because this is a wildcard, it	     doesn't matter if the user does not	     actually link against crtbegin.o; the	     linker won't look for a file to match a	     wildcard.  The wildcard also means that it	     doesn't matter which directory crtbegin.o	     is in.  */	  KEEP (*crtbegin.o(.ctors))	  KEEP (*crtbegin?.o(.ctors))	  /* We don't want to include the .ctor section from	     the crtend.o file until after the sorted ctors.	     The .ctor section from the crtend file contains the	     end of ctors marker and it must be last */	  KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))	  KEEP (*(SORT(.ctors.*)))	  KEEP (*(.ctors))	} >FLASH AT>FLASH 		.dtors          :	{	  KEEP (*crtbegin.o(.dtors))	  KEEP (*crtbegin?.o(.dtors))	  KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))	  KEEP (*(SORT(.dtors.*)))	  KEEP (*(.dtors))	} >FLASH AT>FLASH 	.dalign :	{		. = ALIGN(4);		PROVIDE(_data_vma = .);	} >RAM AT>FLASH		.dlalign :	{		. = ALIGN(4); 		PROVIDE(_data_lma = .);	} >FLASH AT>FLASH	.data :	{    	*(.gnu.linkonce.r.*)    	*(.data .data.*)    	*(.gnu.linkonce.d.*)		. = ALIGN(8);    	PROVIDE( __global_pointer$ = . + 0x800 );    	*(.sdata .sdata.*)		*(.sdata2.*)    	*(.gnu.linkonce.s.*)    	. = ALIGN(8);    	*(.srodata.cst16)    	*(.srodata.cst8)    	*(.srodata.cst4)    	*(.srodata.cst2)    	*(.srodata .srodata.*)    	. = ALIGN(4);		PROVIDE( _edata = .);	} >RAM AT>FLASH	.bss :	{		. = ALIGN(4);		PROVIDE( _sbss = .);  	    *(.sbss*)        *(.gnu.linkonce.sb.*)		*(.bss*)     	*(.gnu.linkonce.b.*)				*(COMMON*)		. = ALIGN(4);		PROVIDE( _ebss = .);	} >RAM AT>FLASH	PROVIDE( _end = _ebss);	PROVIDE( end = . );    .stack ORIGIN(RAM) + LENGTH(RAM) - __stack_size :    {        PROVIDE( _heap_end = . );           . = ALIGN(4);        PROVIDE(_susrstack = . );        . = . + __stack_size;        PROVIDE( _eusrstack = .);    } >RAM }
+__flash_size = DEFINED(__FLASH_SIZE) ? __FLASH_SIZE : 64K;__ram_size = DEFINED(__RAM_SIZE) ? __RAM_SIZE : 20K;__stack_size = DEFINED(__STACK_SIZE) ? __STACK_SIZE : 2048;ENTRY( _start )PROVIDE( _stack_size = __stack_size );MEMORY{  /* CH32V20x_D6 - CH32V203F6-CH32V203G6-CH32V203K6-CH32V203C6 *//*	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 32K	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10K*/ /* CH32V20x_D6 - CH32V203K8-CH32V203C8-CH32V203G8-CH32V203F8 *//**/	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = __flash_size	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = __ram_size   /* CH32V20x_D8 - CH32V203RB   CH32V20x_D8W - CH32V208x   FLASH + RAM supports the following configuration   FLASH-128K + RAM-64K   FLASH-144K + RAM-48K   FLASH-160K + RAM-32K	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 160K	RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 32K*/}SECTIONS{	.init :	{		_sinit = .;		. = ALIGN(4);		KEEP(*(SORT_NONE(.init)))		. = ALIGN(4);		_einit = .;	} >FLASH AT>FLASH  .vector :  {      *(.vector);	  . = ALIGN(64);  } >FLASH AT>FLASH	.text :	{		. = ALIGN(4);		*(.text)		*(.text.*)		*(.rodata)		*(.rodata*)		*(.gnu.linkonce.t.*)		. = ALIGN(4);	} >FLASH AT>FLASH 	.fini :	{		KEEP(*(SORT_NONE(.fini)))		. = ALIGN(4);	} >FLASH AT>FLASH	PROVIDE( _etext = . );	PROVIDE( _eitcm = . );		.preinit_array  :	{	  PROVIDE_HIDDEN (__preinit_array_start = .);	  KEEP (*(.preinit_array))	  PROVIDE_HIDDEN (__preinit_array_end = .);	} >FLASH AT>FLASH 		.init_array     :	{	  PROVIDE_HIDDEN (__init_array_start = .);	  KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*)))	  KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors))	  PROVIDE_HIDDEN (__init_array_end = .);	} >FLASH AT>FLASH 		.fini_array     :	{	  PROVIDE_HIDDEN (__fini_array_start = .);	  KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*)))	  KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors))	  PROVIDE_HIDDEN (__fini_array_end = .);	} >FLASH AT>FLASH 		.ctors          :	{	  /* gcc uses crtbegin.o to find the start of	     the constructors, so we make sure it is	     first.  Because this is a wildcard, it	     doesn't matter if the user does not	     actually link against crtbegin.o; the	     linker won't look for a file to match a	     wildcard.  The wildcard also means that it	     doesn't matter which directory crtbegin.o	     is in.  */	  KEEP (*crtbegin.o(.ctors))	  KEEP (*crtbegin?.o(.ctors))	  /* We don't want to include the .ctor section from	     the crtend.o file until after the sorted ctors.	     The .ctor section from the crtend file contains the	     end of ctors marker and it must be last */	  KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors))	  KEEP (*(SORT(.ctors.*)))	  KEEP (*(.ctors))	} >FLASH AT>FLASH 		.dtors          :	{	  KEEP (*crtbegin.o(.dtors))	  KEEP (*crtbegin?.o(.dtors))	  KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors))	  KEEP (*(SORT(.dtors.*)))	  KEEP (*(.dtors))	} >FLASH AT>FLASH 	.dalign :	{		. = ALIGN(4);		PROVIDE(_data_vma = .);	} >RAM AT>FLASH		.dlalign :	{		. = ALIGN(4); 		PROVIDE(_data_lma = .);	} >FLASH AT>FLASH	.data :	{    	*(.gnu.linkonce.r.*)    	*(.data .data.*)    	*(.gnu.linkonce.d.*)		. = ALIGN(8);    	PROVIDE( __global_pointer$ = . + 0x800 );    	*(.sdata .sdata.*)		*(.sdata2.*)    	*(.gnu.linkonce.s.*)    	. = ALIGN(8);    	*(.srodata.cst16)    	*(.srodata.cst8)    	*(.srodata.cst4)    	*(.srodata.cst2)    	*(.srodata .srodata.*)    	. = ALIGN(4);		PROVIDE( _edata = .);	} >RAM AT>FLASH	.bss :	{		. = ALIGN(4);		PROVIDE( _sbss = .);  	    *(.sbss*)        *(.gnu.linkonce.sb.*)		*(.bss*)     	*(.gnu.linkonce.b.*)				*(COMMON*)		. = ALIGN(4);		PROVIDE( _ebss = .);	} >RAM AT>FLASH	PROVIDE( _end = _ebss);	PROVIDE( end = . );    .stack ORIGIN(RAM) + LENGTH(RAM) - __stack_size :    {        PROVIDE( _heap_end = . );           . = ALIGN(4);        PROVIDE(_susrstack = . );        . = . + __stack_size;        PROVIDE( _eusrstack = .);    } >RAM }

tools/makeboards.py

@@ -77,8 +77,9 @@
         'pnums': {
             'CH32V203RB': {'name': 'CH32V203RB EVT', 'maximum_size': 131072, 'maximum_data_size': 65536, 'mcu': 'QingKe-V4C', 'chip': 'CH32V203'},
             'CH32V203G8': {'name': 'CH32V203G8 EVT', 'maximum_size': 65536, 'maximum_data_size': 20480, 'mcu': 'QingKe-V4B', 'chip': 'CH32V203'},
+            'CH32V203G6': {'name': 'CH32V203G6 EVT', 'maximum_size': 32768, 'maximum_data_size': 10240, 'mcu': 'QingKe-V4B', 'chip': 'CH32V203'},
             'CH32V203C8': {'name': 'CH32V203C8', 'maximum_size': 65536, 'maximum_data_size': 20480, 'mcu': 'QingKe-V4B', 'chip': 'CH32V203'},
-            'CH32V203C6': {'name': 'CH32V203C6', 'maximum_size': 32768, 'maximum_data_size': 20480, 'mcu': 'QingKe-V4B', 'chip': 'CH32V203'},
+            'CH32V203C6': {'name': 'CH32V203C6', 'maximum_size': 32768, 'maximum_data_size': 10240, 'mcu': 'QingKe-V4B', 'chip': 'CH32V203'},
         }
     },
     'CH32V30x': {

variants/CH32V20x/CH32V203G6/CMakeLists.txt

@@ -0,0 +1,30 @@
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+
+add_library(variant INTERFACE)
+add_library(variant_usage INTERFACE)
+
+target_include_directories(variant_usage INTERFACE
+  .
+)
+
+
+target_link_libraries(variant_usage INTERFACE
+  base_config
+)
+
+target_link_libraries(variant INTERFACE variant_usage)
+
+
+
+add_library(variant_bin STATIC EXCLUDE_FROM_ALL
+  PeripheralPins.c
+  variant_CH32V203G6.cpp
+)
+target_link_libraries(variant_bin PUBLIC variant_usage)
+
+target_link_libraries(variant INTERFACE
+  variant_bin
+)
+