v30x, v20x, v10x support

.gitignore

@@ -11,3 +11,4 @@ minichlink/minichlink.so
 compile_commands.json
 .clangd
 .cache
+ch32v003fun/generated_*.ld

ch32v003fun/ch32v003fun.ld

@@ -2,8 +2,45 @@ ENTRY( InterruptVector )
 
 MEMORY
 {
+#if TARGET_MCU == CH32V003
 	FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 16K
 	RAM (xrw)  : ORIGIN = 0x20000000, LENGTH = 2K
+#elif TARGET_MCU == CH32V10x
+	#if MCU_PACKAGE == 1
+		FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 64K
+		RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K
+	#elif MCU_PACKAGE == 2
+		FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 32K
+		RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10K
+	#else
+		#error "Unknown MCU package"
+	#endif
+#elif TARGET_MCU == CH32V20x
+	#if MCU_PACKAGE == 1
+		FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 64K
+		RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 20K
+	#elif MCU_PACKAGE == 2
+		FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 32K
+		RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 10K
+	#elif MCU_PACKAGE == 3
+		FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 128K
+		RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 64K
+	#else
+		#error "Unknown MCU package"
+	#endif
+#elif TARGET_MCU == CH32V30x
+	#if MCU_PACKAGE == 1
+		FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 256K
+		RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 64K
+	#elif MCU_PACKAGE == 2
+		FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 128K
+		RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 32K
+	#else
+		#error "Unknown MCU package"
+	#endif
+#else
+	#error "Unknown MCU target"
+#endif
 }
 
 SECTIONS

ch32v003fun/ch32v003fun.mk

@@ -8,6 +8,9 @@ else
     endif
 endif
 
+TARGET_MCU?=CH32V003
+TARGET_EXT?=c
+
 CH32V003FUN?=../../ch32v003fun
 MINICHLINK?=$(CH32V003FUN)/../minichlink
 
@@ -22,16 +25,43 @@ CFLAGS+= \
 	-nostdlib \
 	-I. -Wall $(EXTRA_CFLAGS)
 
-LINKER_SCRIPT?=$(CH32V003FUN)/ch32v003fun.ld
+WRITE_SECTION?=flash
+SYSTEM_C?=$(CH32V003FUN)/ch32v003fun.c
+
+ifeq ($(TARGET_MCU),CH32V003)
+	CFLAGS+= \
+		-g -Os -flto -ffunction-sections \
+		-static-libgcc \
+		-march=rv32ec \
+		-mabi=ilp32e \
+		-I/usr/include/newlib \
+		-I$(CH32V003FUN)/../extralibs \
+		-I$(CH32V003FUN) \
+		-nostdlib \
+		-DCH32V003=1 \
+		-I. -Wall $(EXTRA_CFLAGS)
+
+	GENERATED_LD_FILE?=$(CH32V003FUN)/generated_ch32v003.ld
+	LINKER_SCRIPT?=$(GENERATED_LD_FILE)
+else
+	ifeq ($(findstring CH32V10,$(TARGET_MCU)),CH32V10)
+		include $(CH32V003FUN)/ch32v10xfun.mk
+	else ifeq ($(findstring CH32V20,$(TARGET_MCU)),CH32V20)
+		include $(CH32V003FUN)/ch32v20xfun.mk
+	else ifeq ($(findstring CH32V30,$(TARGET_MCU)),CH32V30)
+		include $(CH32V003FUN)/ch32v30xfun.mk
+	else
+		$(error Unknown MCU $(TARGET_MCU))
+	endif
+endif
 
 LDFLAGS+=-T $(LINKER_SCRIPT) -Wl,--gc-sections -L$(CH32V003FUN)/../misc -lgcc
 
-WRITE_SECTION?=flash
-SYSTEM_C?=$(CH32V003FUN)/ch32v003fun.c
-TARGET_EXT?=c
+ifeq ($(TARGET_MCU), CH32V003)
 
-$(TARGET).elf : $(SYSTEM_C) $(TARGET).$(TARGET_EXT) $(ADDITIONAL_C_FILES)
-	$(PREFIX)-gcc -o $@ $^ $(CFLAGS) $(LDFLAGS)
+FILES_TO_COMPILE:=$(SYSTEM_C) $(TARGET).$(TARGET_EXT) $(ADDITIONAL_C_FILES) 
+
+endif
 
 $(TARGET).bin : $(TARGET).elf
 	$(PREFIX)-size $^
@@ -68,6 +98,13 @@ clangd_clean :
 
 FLASH_COMMAND?=$(MINICHLINK)/minichlink -w $< $(WRITE_SECTION) -b
 
+$(GENERATED_LD_FILE) :
+	$(PREFIX)-gcc -E -P -x c -DTARGET_MCU=$(TARGET_MCU) $(CH32V003FUN)/ch32v003fun.ld > $(GENERATED_LD_FILE)
+
+
+$(TARGET).elf : $(FILES_TO_COMPILE) $(LINKER_SCRIPT)
+	$(PREFIX)-gcc -o $@ $(FILES_TO_COMPILE) $(CFLAGS) $(LDFLAGS)
+
 cv_flash : $(TARGET).bin
 	make -C $(MINICHLINK) all
 	$(FLASH_COMMAND)

ch32v003fun/ch32v10xfun.mk

@@ -0,0 +1,31 @@
+TARGET_MCU_PACKAGE?=CH32V103R8T6
+MCU_PACKAGE?=1
+
+CFLAGS+= \
+	-g -Os -flto -ffunction-sections -fdata-sections \
+	-static-libgcc \
+	-march=rv32imac \
+	-mabi=ilp32 \
+	-msmall-data-limit=8 \
+	-mno-save-restore \
+	-fmessage-length=0 \
+	-fsigned-char \
+	-I/usr/include/newlib \
+	-I$(CH32V003FUN) \
+	-nostdlib \
+	-DCH32V10x=1 \
+	-I. -Wall
+
+# MCU Flash/RAM split
+ifeq ($(findstring R8, $(TARGET_MCU_PACKAGE)), R8)
+	MCU_PACKAGE:=1
+else ifeq ($(findstring C8, $(TARGET_MCU_PACKAGE)), C8)
+	MCU_PACKAGE:=1
+else ifeq ($(findstring C6, $(TARGET_MCU_PACKAGE)), C6)
+	MCU_PACKAGE:=2
+endif
+
+GENERATED_LD_FILE:=$(CH32V003FUN)/generated_$(TARGET_MCU_PACKAGE).ld
+LINKER_SCRIPT:=$(GENERATED_LD_FILE)
+FILES_TO_COMPILE:=$(SYSTEM_C) $(TARGET).$(TARGET_EXT) $(ADDITIONAL_C_FILES)
+

ch32v003fun/ch32v20xfun.mk

@@ -0,0 +1,59 @@
+TARGET_MCU_PACKAGE?=CH32V203F8P6
+MCU_PACKAGE?=1
+
+CFLAGS+= \
+	-g -Os -flto -ffunction-sections -fdata-sections \
+	-static-libgcc \
+	-march=rv32imac \
+	-mabi=ilp32 \
+	-msmall-data-limit=8 \
+	-mno-save-restore \
+	-fmessage-length=0 \
+	-fsigned-char \
+	-I/usr/include/newlib \
+	-I$(CH32V003FUN) \
+	-nostdlib \
+	-DCH32V20x=1 \
+	-I. -Wall
+
+# MCU Flash/RAM split
+ifeq ($(findstring F8, $(TARGET_MCU_PACKAGE)), F8)
+	MCU_PACKAGE:=1
+else ifeq ($(findstring G8, $(TARGET_MCU_PACKAGE)), G8)
+	MCU_PACKAGE:=1
+else ifeq ($(findstring K8, $(TARGET_MCU_PACKAGE)), K8)
+	MCU_PACKAGE:=1
+else ifeq ($(findstring C8, $(TARGET_MCU_PACKAGE)), C8)
+	MCU_PACKAGE:=1
+else ifeq ($(findstring F6, $(TARGET_MCU_PACKAGE)), F6)
+	MCU_PACKAGE:=2
+else ifeq ($(findstring G6, $(TARGET_MCU_PACKAGE)), G6)
+	MCU_PACKAGE:=2
+else ifeq ($(findstring K6, $(TARGET_MCU_PACKAGE)), K6)
+	MCU_PACKAGE:=2
+else ifeq ($(findstring C6, $(TARGET_MCU_PACKAGE)), C6)
+	MCU_PACKAGE:=2
+else ifeq ($(findstring RB, $(TARGET_MCU_PACKAGE)), RB)
+	MCU_PACKAGE:=3
+else ifeq ($(findstring GB, $(TARGET_MCU_PACKAGE)), GB)
+    MCU_PACKAGE:=3
+else ifeq ($(findstring CB, $(TARGET_MCU_PACKAGE)), CB)
+    MCU_PACKAGE:=3
+else ifeq ($(findstring WB, $(TARGET_MCU_PACKAGE)), WB)
+    MCU_PACKAGE:=3
+endif
+
+# Package
+ifeq ($(findstring 203RB, $(TARGET_MCU_PACKAGE)), 203RB)
+	CFLAGS+=-DCH32V20x_D8
+else ifeq ($(findstring 208, $(TARGET_MCU_PACKAGE)), 208)
+	CFLAGS+=-DCH32V20x_D8W
+else
+	CFLAGS+=-DCH32V20x_D6
+endif
+
+GENERATED_LD_FILE:=$(CH32V003FUN)/generated_$(TARGET_MCU_PACKAGE).ld
+LINKER_SCRIPT:=$(GENERATED_LD_FILE)
+FILES_TO_COMPILE:=$(SYSTEM_C) $(TARGET).$(TARGET_EXT) $(ADDITIONAL_C_FILES)
+
+

ch32v003fun/ch32v30xfun.mk

@@ -0,0 +1,44 @@
+TARGET_MCU_PACKAGE?=CH32V307VCT6
+MCU_PACKAGE?=1
+
+CFLAGS+= \
+	-g -Os -flto -ffunction-sections -fdata-sections \
+	-static-libgcc \
+	-march=rv32imafc \
+	-mabi=ilp32f \
+	-msmall-data-limit=8 \
+	-mno-save-restore \
+	-fmessage-length=0 \
+	-fsigned-char \
+	-I/usr/include/newlib \
+	-I$(CH32V003FUN) \
+	-nostdlib \
+	-DCH32V30x=1 \
+	-I. -Wall
+
+# MCU Flash/RAM split
+ifeq ($(findstring RC, $(TARGET_MCU_PACKAGE)), RC)
+	MCU_PACKAGE:=1
+else ifeq ($(findstring VC, $(TARGET_MCU_PACKAGE)), VC)
+	MCU_PACKAGE:=1
+else ifeq ($(findstring WC, $(TARGET_MCU_PACKAGE)), WC)
+	MCU_PACKAGE:=1
+else ifeq ($(findstring CB, $(TARGET_MCU_PACKAGE)), CB)
+	MCU_PACKAGE:=2
+else ifeq ($(findstring FB, $(TARGET_MCU_PACKAGE)), FB)
+	MCU_PACKAGE:=2
+else ifeq ($(findstring RB, $(TARGET_MCU_PACKAGE)), RB)
+	MCU_PACKAGE:=2
+endif
+
+# Package
+ifeq ($(findstring 303, $(TARGET_MCU_PACKAGE)), 303)
+	CFLAGS+=-DCH32V30x_D8
+else
+	CFLAGS+=-DCH32V30x_D8C
+endif
+
+GENERATED_LD_FILE:=$(CH32V003FUN)/generated_$(TARGET_MCU_PACKAGE).ld
+LINKER_SCRIPT:=$(GENERATED_LD_FILE)
+FILES_TO_COMPILE:=$(SYSTEM_C) $(TARGET).$(TARGET_EXT) $(ADDITIONAL_C_FILES)
+

examples/cpp_virtual_methods/Makefile

@@ -18,6 +18,7 @@ CFLAGS:= \
 	-I/usr/include/newlib \
 	-I$(CH32V003FUN) \
 	-nostdlib \
+	-DCH32V003 \
 	-I. -Wall
 
 CFLAGS+=-fno-rtti -DCPLUSPLUS

examples_v10x/blink/Makefile

@@ -0,0 +1,11 @@
+all : flash
+
+TARGET:=blink
+TARGET_MCU:=CH32V103
+
+include ../../ch32v003fun/ch32v003fun.mk
+
+flash : cv_flash
+clean : cv_clean
+
+

examples_v10x/blink/blink.c

@@ -0,0 +1,23 @@
+#include "ch32v003fun.h"
+#include <stdio.h>
+
+int main()
+{
+	SystemInit();
+
+	// Enable GPIOs
+	//RCC->APB2PCENR |= RCC_APB2Periph_GPIOD | RCC_APB2Periph_GPIOC;
+	RCC->APB2PCENR |= RCC_APB2Periph_GPIOA;
+
+	// GPIO A0 Push-Pull
+	GPIOA->CFGLR &= ~(0xf<<(4*0));
+	GPIOA->CFGLR |= (GPIO_Speed_10MHz | GPIO_CNF_OUT_PP)<<(4*0);
+
+	while(1)
+	{
+		GPIOA->BSHR = (1<<0);	 // Turn on GPIO
+		Delay_Ms( 1000 );
+		GPIOA->BSHR = (1<<(16+0)); // Turn off GPIO
+		Delay_Ms( 1000 );
+	}
+}

examples_v10x/blink/funconfig.h

@@ -0,0 +1,7 @@
+#ifndef _FUNCONFIG_H
+#define _FUNCONFIG_H
+
+//#define CH32V10x           1
+
+#endif
+

examples_v20x/blink/Makefile

@@ -0,0 +1,11 @@
+all : flash
+
+TARGET:=blink
+TARGET_MCU:=CH32V203
+
+include ../../ch32v003fun/ch32v003fun.mk
+
+flash : cv_flash
+clean : cv_clean
+
+

examples_v20x/blink/blink.c

@@ -0,0 +1,19 @@
+#include "ch32v003fun.h"
+#include <stdio.h>
+
+int main()
+{
+	SystemInit();
+
+	funGpioInitAll();
+
+	funPinMode( PA15, GPIO_CFGLR_OUT_10Mhz_PP );
+
+	while(1)
+	{
+		funDigitalWrite( PA15, FUN_HIGH );	 // Turn on GPIO
+		Delay_Ms( 1000 );
+		funDigitalWrite( PA15, FUN_LOW );	 // Turn off GPIO
+		Delay_Ms( 1000 );
+	}
+}

examples_v20x/blink/funconfig.h

@@ -0,0 +1,7 @@
+#ifndef _FUNCONFIG_H
+#define _FUNCONFIG_H
+
+// #define CH32V20x           1
+
+#endif
+

examples_v20x/mcotest/Makefile

@@ -0,0 +1,11 @@
+all : flash
+
+TARGET:=mcotest
+TARGET_MCU:=CH32V203
+
+include ../../ch32v003fun/ch32v003fun.mk
+
+flash : cv_flash
+clean : cv_clean
+
+

examples_v20x/mcotest/funconfig.h

@@ -0,0 +1,7 @@
+#ifndef _FUNCONFIG_H
+#define _FUNCONFIG_H
+
+// #define CH32V20x           1
+
+#endif
+

examples_v20x/mcotest/mcotest.c

@@ -0,0 +1,18 @@
+#include "ch32v003fun.h"
+#include <stdio.h>
+
+int main()
+{
+	SystemInit();
+
+	funGpioInitAll();
+
+	funPinMode( PA8, GPIO_CFGLR_OUT_50Mhz_AF_PP );
+
+	RCC->CFGR0 = RCC_CFGR0_MCO_PLL;
+
+	while(1)
+	{
+	}
+}
+