otto.sh

@@ -258,9 +258,8 @@ build_hex_optimized () {
     CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${WCH_TC}"
     
     cmake ${CMAKE_ARGS} ../
-    #make all
+    make all
-    #make hex-release
+    make hex-release
-    make main
 }
 
 flash_microcontroller () {

riscv32-toolchain.cmake

@@ -38,8 +38,6 @@ if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD")
     set(CMAKE_ASM_COMPILER riscv32-unknown-elf-gcc)
     set(CMAKE_FIND_ROOT_PATH /usr/local/riscv/)
 
-    #set(CMAKE_SYSROOT "/usr/local/riscv/" /usr/local/riscv/riscv32-unknown-elf)
-
     # Without these two lines it freaks out.
     set(CMAKE_C_STANDARD_COMPUTED_DEFAULT GNU)
     set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT GNU)
@@ -121,10 +119,10 @@ UNSET(CMAKE_C_FLAGS CACHE)
 UNSET(CMAKE_CXX_FLAGS CACHE)
 
 # I'm appending to the existing cflags from the cmake file in the root dir.
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_FLAGS_ARCH} ${OBJECT_GEN_FLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_FLAGS_ARCH} ${OBJECT_GEN_FLAGS}")
-#set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${C_FLAGS_ARCH} ${OBJECT_GEN_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${C_FLAGS_ARCH} ${OBJECT_GEN_FLAGS}")
-#set(CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} ${C_FLAGS_ARCH} ${OBJECT_GEN_FLAGS}" CACHE STRING "" FORCE)
+set(CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} ${C_FLAGS_ARCH} ${OBJECT_GEN_FLAGS}" CACHE STRING "" FORCE)
-#set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} ${C_FLAGS_ARCH} ${OBJECT_GEN_FLAGS}" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} ${C_FLAGS_ARCH} ${OBJECT_GEN_FLAGS}" CACHE STRING "" FORCE)
 
 
 #-------------------

src/CMakeLists.txt

@@ -26,11 +26,11 @@ target_compile_options(${PROJECT_NAME} PUBLIC
     -DCH32V003=1
     -static-libgcc
     -nostdlib
-    #-Wl,--print-memory-usage
+    -Wl,--print-memory-usage
-    #-Wl,-Map=${PROJECT_NAME}.map
+    -Wl,-Map=${PROJECT_NAME}.map
     -lgcc
-    #-Wl,--gc-sections
+    -Wl,--gc-sections
-    #-T${CMAKE_SOURCE_DIR}/src/linker_script.ld
+    -T${CMAKE_SOURCE_DIR}/src/linker_script.ld
 )
 
 target_link_options(${PROJECT_NAME} PUBLIC
@@ -48,6 +48,7 @@ target_link_options(${PROJECT_NAME} PUBLIC
     -nostdlib
     -Wl,--print-memory-usage
     -Wl,-Map=${PROJECT_NAME}.map
+    -lgcc
     -Wl,--gc-sections
     -T${CMAKE_SOURCE_DIR}/src/linker_script.ld
 )

src/ch32fun.c

@@ -85,8 +85,7 @@ void __libc_init_array(void)
 #define _SSP_STRING_H_
 #define _SSP_STDIO_H_
 
-//#include "ch32fun.h"
+#include "ch32fun.h"
-#include <ch32fun.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdint.h>