From 2f2505152c4ef2f8c8af525461e2de18e6d1fffe Mon Sep 17 00:00:00 2001 From: Yilin Sun Date: Mon, 10 Apr 2023 22:05:32 +0800 Subject: [PATCH] Updated CMake scripts. --- CMakeLists.txt | 92 ++++++++++++++++++++++++++--------------------- riscv64-elf.cmake | 15 +++++++- src/board.c | 7 ++-- src/ch32v30x_it.c | 25 +++++++------ src/main.c | 6 ++-- src/syscalls.c | 22 ++++++------ 6 files changed, 95 insertions(+), 72 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9062e7e..27e0ec9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,16 +7,12 @@ project(ch32v307_template) enable_language(CXX) enable_language(ASM) -# Extra CFlags -set(TARGET_CFLAGS_EXTRA "") -set(TARGET_CXXFLAGS_EXTRA "") -set(TARGET_LDFLAGS_EXTRA "-Wl,--print-memory-usage") - # Different linker scripts set(TARGET_LDSCRIPT_FLASH "${CMAKE_SOURCE_DIR}/BSP/Ld/Link.ld") +set(TARGET_LDSCRIPT_RAM "${CMAKE_SOURCE_DIR}/BSP/Ld/Link.ld") # Copy them from Makefile -set(TARGET_C_SOURCES +set(TARGET_SOURCES "BSP/Core/core_riscv.c" "BSP/Debug/debug.c" "BSP/Peripheral/src/ch32v30x_adc.c" @@ -45,6 +41,7 @@ set(TARGET_C_SOURCES "BSP/Peripheral/src/ch32v30x_tim.c" "BSP/Peripheral/src/ch32v30x_usart.c" "BSP/Peripheral/src/ch32v30x_wwdg.c" + "BSP/Startup/startup_ch32v30x_D8C.S" "src/board.c" "src/ch32v30x_it.c" "src/main.c" @@ -52,11 +49,6 @@ set(TARGET_C_SOURCES "src/system_ch32v30x.c" ) -# Copy them from Makefile -set(TARGET_ASM_SOURCES - "BSP/Startup/startup_ch32v30x_D8C.S" -) - # Copy them from Makefile set(TARGET_C_DEFINES ) @@ -71,15 +63,15 @@ set(TARGET_C_INCLUDES # Shared libraries linked with application set(TARGET_LIBS + "c" + "m" + "nosys" ) # Shared library and linker script search paths set(TARGET_LIB_DIRECTORIES ) -# Device specific settings, goes to CFLAGS and LDFLAGS -set(TARGET_CFLAGS_HARDWARE "-march=rv32imafc -mabi=ilp32f") - # Conditional flags # DEBUG set(CMAKE_C_FLAGS_DEBUG "-DDEBUG -Og -g") @@ -93,39 +85,59 @@ set(CMAKE_ASM_FLAGS_RELEASE "-DNDEBUG -O2 -flto") set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-flto") # Final compiler flags -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_CFLAGS_HARDWARE} ${TARGET_CFLAGS_EXTRA} -Wall -fdata-sections -ffunction-sections") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TARGET_CFLAGS_HARDWARE} ${TARGET_CXXFLAGS_EXTRA} -Wall -fdata-sections -ffunction-sections") -set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${CMAKE_C_FLAGS} -x assembler-with-cpp") -set(CMAKE_EXE_LINKER_FLAGS "-specs=nano.specs -specs=nosys.specs -Wl,--gc-sections -nostartfiles -nostdlib ${TARGET_LDFLAGS_EXTRA}") - -# Include sub directories here +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fno-common -fno-builtin -ffreestanding -fdata-sections -ffunction-sections") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-common -fno-builtin -ffreestanding -fdata-sections -ffunction-sections") +set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections") # Shared sources, includes and definitions add_compile_definitions(${TARGET_C_DEFINES}) include_directories(${TARGET_C_INCLUDES}) link_directories(${TARGET_LIB_DIRECTORIES}) -link_libraries( - ${TARGET_LIBS} - "c" - "m" - "nosys" -) +link_libraries(${TARGET_LIBS}) # Main targets are added here -# **** Internal Flash **** +# Create ELF +add_executable("${CMAKE_PROJECT_NAME}_FLASH.elf" ${TARGET_SOURCES}) +target_compile_definitions("${CMAKE_PROJECT_NAME}_FLASH.elf" + PRIVATE ${TARGET_C_DEFINES_XIP} + ) +target_link_options("${CMAKE_PROJECT_NAME}_FLASH.elf" + PRIVATE "-T${TARGET_LDSCRIPT_FLASH}" + PRIVATE "-Wl,--Map=${CMAKE_PROJECT_NAME}_FLASH.map" + ) +set_property(TARGET "${CMAKE_PROJECT_NAME}_FLASH.elf" APPEND + PROPERTY ADDITIONAL_CLEAN_FILES "${CMAKE_PROJECT_NAME}_FLASH.map" + ) +add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}_FLASH.hex" + COMMAND ${CMAKE_OBJCOPY} "-O" "ihex" "${CMAKE_PROJECT_NAME}_FLASH.elf" "${CMAKE_PROJECT_NAME}_FLASH.hex" + DEPENDS "${CMAKE_PROJECT_NAME}_FLASH.elf" + ) +add_custom_target("${CMAKE_PROJECT_NAME}_FLASH_HEX" DEPENDS "${CMAKE_PROJECT_NAME}_FLASH.hex") +if(DEFINED TARGET_TOOLCHAIN_SIZE) + add_custom_command(TARGET "${CMAKE_PROJECT_NAME}_FLASH.elf" POST_BUILD + COMMAND ${TARGET_TOOLCHAIN_SIZE} "${CMAKE_PROJECT_NAME}_FLASH.elf" + ) +endif() + # Create ELF -add_executable("${CMAKE_PROJECT_NAME}_FLASH.elf" ${TARGET_C_SOURCES} ${TARGET_ASM_SOURCES}) -target_link_options("${CMAKE_PROJECT_NAME}_FLASH.elf" - PRIVATE "-T${TARGET_LDSCRIPT_FLASH}" - PRIVATE "-Wl,-Map=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}_FLASH.map,--cref" -) - -add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}_FLASH.hex" - COMMAND ${CMAKE_OBJCOPY} "-O" "ihex" "${CMAKE_PROJECT_NAME}_FLASH.elf" "${CMAKE_PROJECT_NAME}_FLASH.hex" - DEPENDS "${CMAKE_PROJECT_NAME}_FLASH.elf" -) -add_custom_target("${CMAKE_PROJECT_NAME}_FLASH_HEX" DEPENDS "${CMAKE_PROJECT_NAME}_FLASH.hex") - -# **** Cortex-M0 does not support SCB->VTOR configuration, so RAM debug is not possible. **** \ No newline at end of file +add_executable("${CMAKE_PROJECT_NAME}_RAM.elf" ${TARGET_SOURCES}) +target_link_options("${CMAKE_PROJECT_NAME}_RAM.elf" + PRIVATE "-T${TARGET_LDSCRIPT_RAM}" + PRIVATE "-Wl,--Map=${CMAKE_PROJECT_NAME}_RAM.map" + ) +set_property(TARGET "${CMAKE_PROJECT_NAME}_RAM.elf" APPEND + PROPERTY ADDITIONAL_CLEAN_FILES "${CMAKE_PROJECT_NAME}_RAM.map" + ) +add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}_RAM.hex" + COMMAND ${CMAKE_OBJCOPY} "-O" "ihex" "${CMAKE_PROJECT_NAME}_RAM.elf" "${CMAKE_PROJECT_NAME}_RAM.hex" + DEPENDS "${CMAKE_PROJECT_NAME}_RAM.elf" + ) +add_custom_target("${CMAKE_PROJECT_NAME}_RAM_HEX" DEPENDS "${CMAKE_PROJECT_NAME}_RAM.hex") +if(DEFINED TARGET_TOOLCHAIN_SIZE) + add_custom_command(TARGET "${CMAKE_PROJECT_NAME}_RAM.elf" POST_BUILD + COMMAND ${TARGET_TOOLCHAIN_SIZE} "${CMAKE_PROJECT_NAME}_RAM.elf" + ) +endif() diff --git a/riscv64-elf.cmake b/riscv64-elf.cmake index 2a6a204..d3fe8b5 100644 --- a/riscv64-elf.cmake +++ b/riscv64-elf.cmake @@ -1,4 +1,17 @@ -set(CMAKE_C_COMPILER riscv64-elf-gcc) +# Poor old Windows... +if(WIN32) + set(CMAKE_SYSTEM_NAME "Generic") +endif() + +set(CMAKE_C_COMPILER riscv64-elf-gcc) set(CMAKE_CXX_COMPILER riscv64-elf-g++) + +# Optionally set size binary name, for elf section size reporting. +set(TARGET_TOOLCHAIN_SIZE arm-none-eabi-size) + +set(CMAKE_C_FLAGS_INIT "-march=rv32imafc -mabi=ilp32f") +set(CMAKE_CXX_FLAGS_INIT "-march=rv32imafc -mabi=ilp32f") +set(CMAKE_EXE_LINKER_FLAGS_INIT "-specs=nano.specs -specs=nosys.specs -nostartfiles -nostdlib -Wl,--print-memory-usage -Wl,--no-warn-rwx-segments") + # Make CMake happy about those compilers set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") \ No newline at end of file diff --git a/src/board.c b/src/board.c index 280b066..cd72876 100644 --- a/src/board.c +++ b/src/board.c @@ -2,7 +2,7 @@ /** * @brief Initialize IOMUX. - * + * */ void BOARD_IOMUX_Init(void) { /* The official devkit (CH32V307V-R1-1v0) @@ -13,7 +13,7 @@ void BOARD_IOMUX_Init(void) { /** * @brief Initialize on-board peripherals. - * + * */ void BOARD_Peripheral_Init(void) { } @@ -21,10 +21,9 @@ void BOARD_Peripheral_Init(void) { /** * @brief Configure system clock, * If you are not satisfied with the default options. - * + * */ void BOARD_SystemClock_Config(void) { - // After you are done playing with RCC... SystemCoreClockUpdate(); } \ No newline at end of file diff --git a/src/ch32v30x_it.c b/src/ch32v30x_it.c index c6fdf83..14d97cb 100644 --- a/src/ch32v30x_it.c +++ b/src/ch32v30x_it.c @@ -4,57 +4,56 @@ #define __IRQ_WEAK __attribute__((interrupt(), weak)) #define __IRQ_NAKED __attribute__((naked)) - /** * FreeRTOS supports both non-vectored and vectored exception model. * For non-vectored exception, use `freertos_risc_v_trap_handler`, * this function will determine the type of current exception. * For vectored exception, use `freertos_risc_v_exception_handler`, * and use `freertos_risc_v_mtimer_interrupt_handler` for timer interrupt. - * + * */ /** * @brief Default Handler for exceptions and interrupts - * + * */ __IRQ_WEAK void Default_Handler(void) { - for(;;) { + for (;;) { /* Where are you from? */ } } /** * @brief Fault handler - * + * */ __IRQ_WEAK void Fault_Handler(void) { - for(;;) { + for (;;) { /* Emmmmmmmmm? */ } } /** * @brief U mode ecall handler - * + * */ __IRQ_WEAK void Ecall_U_Handler(void) { - for(;;) { + for (;;) { /* Who called me? */ } } /** * @brief M mode ecall handler - * + * */ __IRQ_WEAK void Ecall_M_Handler(void) { - /* M mode ecall handler */ + /* M mode ecall handler */ } /** * @brief Non-maskable interrupt handler - * + * */ __IRQ_WEAK void NMI_Handler(void) { /* NMI handler */ @@ -62,7 +61,7 @@ __IRQ_WEAK void NMI_Handler(void) { /** * @brief SysTick interrupt handler - * + * */ __IRQ_WEAK void SysTick_Handler(void) { /* SysTick handler */ @@ -70,7 +69,7 @@ __IRQ_WEAK void SysTick_Handler(void) { /** * @brief Software interrupt handler - * + * */ __IRQ_WEAK void SW_Handler(void) { /* Software handler */ diff --git a/src/main.c b/src/main.c index 863f4d5..73f3c12 100644 --- a/src/main.c +++ b/src/main.c @@ -2,9 +2,8 @@ #include -#include "debug.h" - #include "board.h" +#include "debug.h" int main(void) { /* Initialize board components. */ @@ -12,7 +11,6 @@ int main(void) { BOARD_IOMUX_Init(); BOARD_Peripheral_Init(); - /* Initialize UART for libc function calls. */ USART_Printf_Init(115200); Delay_Init(); /* Silly function, will be replaced next time. */ @@ -21,7 +19,7 @@ int main(void) { uint32_t i = 0; - for(;;) { + for (;;) { Delay_Ms(500); printf("Dead loop @%lu\r\n", i++); } diff --git a/src/syscalls.c b/src/syscalls.c index 535dec0..83dc9e5 100644 --- a/src/syscalls.c +++ b/src/syscalls.c @@ -1,14 +1,13 @@ #include void *_sbrk(ptrdiff_t incr) { - extern char _end[]; - extern char _heap_end[]; + extern char _end[]; + extern char _heap_end[]; static char *curbrk = _end; void *ret; - if ((curbrk + incr < _end) || (curbrk + incr > _heap_end)) - return NULL - 1; + if ((curbrk + incr < _end) || (curbrk + incr > _heap_end)) return NULL - 1; curbrk += incr; ret = curbrk - incr; @@ -16,21 +15,24 @@ void *_sbrk(ptrdiff_t incr) { return ret; } - int _fstat(int file, struct stat *st) { - st->st_mode = S_IFCHR; + st->st_mode = S_IFCHR; - return 0; + return 0; } int _close(int file) { - return -1; + return -1; } int _isatty(int file) { - return -1; + return -1; } off_t _lseek(int file, off_t pos, int whence) { - return -1; + return -1; } + +int _read(int file, char *ptr, int len) { + return 0; +} \ No newline at end of file