diff --git a/software/Power_Pico/CMakeLists.txt b/software/Power_Pico/CMakeLists.txt index 378ae2c..db7894c 100644 --- a/software/Power_Pico/CMakeLists.txt +++ b/software/Power_Pico/CMakeLists.txt @@ -52,7 +52,6 @@ target_link_directories(${CMAKE_PROJECT_NAME} PRIVATE # Collect all source files using file globbing file(GLOB_RECURSE LVGL_SOURCES "Middlewares/LVGL/src/*.c" - "Middlewares/LVGL/src/*.cpp" "Middlewares/LVGL/porting/*.c" ) file(GLOB_RECURSE USER_SOURCES "User/**/*.c") diff --git a/software/Power_Pico/startup_stm32f411xe.s b/software/Power_Pico/startup_stm32f411xe.s index f0c20ee..bae927c 100644 --- a/software/Power_Pico/startup_stm32f411xe.s +++ b/software/Power_Pico/startup_stm32f411xe.s @@ -26,7 +26,7 @@ .syntax unified .cpu cortex-m4 - .fpu fpv4-sp-d16 + .fpu softvfp .thumb .global g_pfnVectors @@ -58,14 +58,17 @@ defined in linker script */ .weak Reset_Handler .type Reset_Handler, %function Reset_Handler: - ldr sp, =_estack /* set stack pointer */ + ldr sp, =_estack /* set stack pointer */ - /* 强行挪到这里:先执行 SystemInit 重定向中断向量表 */ +/* Call the clock system initialization function.*/ bl SystemInit /* Copy the data segment initializers from flash to SRAM */ - movs r1, #0 - b LoopCopyDataInit + ldr r0, =_sdata + ldr r1, =_edata + ldr r2, =_sidata + movs r3, #0 + b LoopCopyDataInit CopyDataInit: ldr r4, [r2, r3] diff --git a/software/bootloader/cmake/gcc-arm-none-eabi.cmake b/software/bootloader/cmake/gcc-arm-none-eabi.cmake index 57738a4..321e8c1 100644 --- a/software/bootloader/cmake/gcc-arm-none-eabi.cmake +++ b/software/bootloader/cmake/gcc-arm-none-eabi.cmake @@ -42,4 +42,4 @@ set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,-Map=${CMAKE_PROJECT_NAME}.map set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--start-group -lc -lm -Wl,--end-group") set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--print-memory-usage") -set(CMAKE_CXX_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--start-group -lstdc++ -lsupc++ -Wl,--end-group") \ No newline at end of file +set(CMAKE_CXX_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--start-group -lstdc++ -lsupc++ -Wl,--end-group")