Skip to content

Optimize building for ch5xx #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cnlohr merged 1 commit into from
Jun 16, 2026
+24 −38
Merged

Optimize building for ch5xx #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ch32fun/ch32fun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2026,8 +2026,8 @@ void SystemInit( void )
#define CLK_SOURCE_CH5XX CLK_SOURCE_PLL_60MHz
#endif
#if (defined(CH570_CH572) || defined(CH584_CH585))
#if (defined(CH584_CH585) && (CLK_SOURCE_CH5XX==CLK_SOURCE_PLL_60MHz))
#warning "The ch584/5 does not support an exact 60MHz setting. Please pick an availabe clock source from the SYS_CLKTypeDef struct in ch5xxhw.h"
#if (defined(CH584_CH585) && CLK_SOURCE_CH5XX == 0xff)
#warning "The ch584/5 does not support an exact 60MHz setting. Please pick an availabe clock source from the SYS_CLKTypeDef enum in ch5xxhw.h"
#warning "Choosing CLK_SOURCE_HSE_PLL_62_4MHz for now"
#undef CLK_SOURCE_CH5XX
#define CLK_SOURCE_CH5XX CLK_SOURCE_HSE_PLL_62_4MHz
Expand Down
33 changes: 20 additions & 13 deletions ch32fun/ch32fun.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,20 +241,23 @@ else ifeq ($(findstring CH32V30,$(TARGET_MCU)),CH32V30) #CH32V307

TARGET_MCU_LD:=3
else ifeq ($(findstring CH57,$(TARGET_MCU)),CH57) # CH570 1 2 3
TARGET_MCU_PACKAGE?=CH570E
CFLAGS_ARCH+=-march=rv32imac \
-mabi=ilp32 \
-DCH57x=1 \
-DCH5xx

# MCU Flash/RAM split
ifeq ($(findstring 570, $(TARGET_MCU_PACKAGE)), 570)
ifeq ($(findstring 570, $(TARGET_MCU)), 570)
TARGET_MCU_PACKAGE?=CH570
MCU_PACKAGE:=0
else ifeq ($(findstring 571, $(TARGET_MCU_PACKAGE)), 571)
else ifeq ($(findstring 571, $(TARGET_MCU)), 571)
TARGET_MCU_PACKAGE?=CH571
MCU_PACKAGE:=1
else ifeq ($(findstring 572, $(TARGET_MCU_PACKAGE)), 572)
else ifeq ($(findstring 572, $(TARGET_MCU)), 572)
TARGET_MCU_PACKAGE?=CH572
MCU_PACKAGE:=2
else ifeq ($(findstring 573, $(TARGET_MCU_PACKAGE)), 573)
else ifeq ($(findstring 573, $(TARGET_MCU)), 573)
TARGET_MCU_PACKAGE?=CH573
MCU_PACKAGE:=3
endif
CFLAGS+=-DMCU_PACKAGE=$(MCU_PACKAGE)
Expand All @@ -273,20 +276,23 @@ else ifeq ($(findstring CH57,$(TARGET_MCU)),CH57) # CH570 1 2 3
TARGET_MCU_LD:=10
IS_CH5XX:=1
else ifeq ($(findstring CH58,$(TARGET_MCU)),CH58) # CH582/3/4/5
TARGET_MCU_PACKAGE?=CH582F
CFLAGS_ARCH+=-march=rv32imac \
-mabi=ilp32 \
-DCH58x=1 \
-DCH5xx

# MCU Flash/RAM split
ifeq ($(findstring 582, $(TARGET_MCU_PACKAGE)), 582)
ifeq ($(findstring 582, $(TARGET_MCU)), 582)
TARGET_MCU_PACKAGE?=CH582
MCU_PACKAGE:=2
else ifeq ($(findstring 583, $(TARGET_MCU_PACKAGE)), 583)
else ifeq ($(findstring 583, $(TARGET_MCU)), 583)
TARGET_MCU_PACKAGE?=CH583
MCU_PACKAGE:=3
else ifeq ($(findstring 584, $(TARGET_MCU_PACKAGE)), 584)
else ifeq ($(findstring 584, $(TARGET_MCU)), 584)
TARGET_MCU_PACKAGE?=CH584
MCU_PACKAGE:=4
else ifeq ($(findstring 585, $(TARGET_MCU_PACKAGE)), 585)
else ifeq ($(findstring 585, $(TARGET_MCU)), 585)
TARGET_MCU_PACKAGE?=CH585
MCU_PACKAGE:=5
endif
CFLAGS+=-DMCU_PACKAGE=$(MCU_PACKAGE)
Expand All @@ -303,16 +309,17 @@ else ifeq ($(findstring CH58,$(TARGET_MCU)),CH58) # CH582/3/4/5
TARGET_MCU_LD:=8
IS_CH5XX:=1
else ifeq ($(findstring CH59,$(TARGET_MCU)),CH59) # CH592 1
TARGET_MCU_PACKAGE?=CH592F
CFLAGS_ARCH+=-march=rv32imac \
-mabi=ilp32 \
-DCH59x=1 \
-DCH5xx

# MCU Flash/RAM split
ifeq ($(findstring 591, $(TARGET_MCU_PACKAGE)), 591)
ifeq ($(findstring 591, $(TARGET_MCU)), 591)
TARGET_MCU_PACKAGE?=CH591
MCU_PACKAGE:=1
else ifeq ($(findstring 592, $(TARGET_MCU_PACKAGE)), 592)
else ifeq ($(findstring 592, $(TARGET_MCU)), 592)
TARGET_MCU_PACKAGE?=CH592
MCU_PACKAGE:=2
endif
CFLAGS+=-DMCU_PACKAGE=$(MCU_PACKAGE)
Expand Down
1 change: 1 addition & 0 deletions ch32fun/ch5xxhw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ typedef enum
CLK_SOURCE_HSE_PLL_24MHz = (0x300 | 0x40 | 13),
CLK_SOURCE_HSE_PLL_19_5MHz = (0x300 | 0x40 | 16),
CLK_SOURCE_HSE_PLL_13MHz = (0x300 | 0x40 | 24),
#define CLK_SOURCE_PLL_60MHz 0xFF // Dummy to catch wrong clock setting for this chip
#elif defined(CH591_CH592)
CLK_SOURCE_LSI = 0x00,
CLK_SOURCE_LSE,
Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/RTC_dateTime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=RTC_dateTime
TARGET_MCU:=CH582
# TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/RTC_irq/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=RTC_irq
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/adc_basic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=adc_basic
TARGET_MCU:=CH582
# TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/adc_dma/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=adc_dma
TARGET_MCU:=CH582
# TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/adc_touch/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=adc_touch
TARGET_MCU:=CH582
# TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/aes/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=aes
TARGET_MCU:=CH592
TARGET_MCU_PACKAGE:=CH592F

all : $(TARGET).bin

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/ble_beacon/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=ble_beacon
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/blink/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=blink
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/boot_button/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=boot_button
TARGET_MCU:=CH570 # only 582/3, 584/5 ch59x and 570/2 are supported currently
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/ch570_encoder_timer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=ch570_encoder_timer
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

all : $(TARGET).bin

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/comparator_adc_demo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=comparator_adc_demo
TARGET_MCU:=CH572
TARGET_MCU_PACKAGE:=CH572Q

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/debugprintfdemo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=debugprintfdemo
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/flashtest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=flashtest
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/i2c_sensors/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=i2c_sensors
TARGET_MCU:=CH582
TARGET_MCU_PACKAGE:=CH582F

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/iSLER/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=iSLER
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/lowpower/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=lowpower
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/mcpy_demo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ all : flash
TARGET:=mcpy_demo

TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/pwm_basic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=pwm_basic
TARGET_MCU:=CH582
# TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/spi_tx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=spi_tx
TARGET_MCU:=CH573
TARGET_MCU_PACKAGE:=CH573F

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/systick_irq/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=systick_irq
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/uart_send_receive/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=uart_send_receive
TARGET_MCU:=CH582
# TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
1 change: 0 additions & 1 deletion examples_ch5xx/uartdemo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ all : flash

TARGET:=uartdemo
TARGET_MCU:=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

Expand Down
2 changes: 1 addition & 1 deletion examples_ch5xx/ws2812bdemo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ all : flash
TARGET:= ws2812bdemo

TARGET_MCU?=CH570
TARGET_MCU_PACKAGE:=CH570D

include ../../ch32fun/ch32fun.mk

flash : cv_flash
Expand Down
Loading