Merge pull request #12 from EmbeddedKitOrg/develop/nn

Develop/nn

Author: 00lllooolll00

.github/workflows/build.yml

@@ -49,8 +49,7 @@ jobs:
           cmake -B build -G Ninja \
                 -DCMAKE_TOOLCHAIN_FILE="cmake/gcc-arm-none-eabi.cmake" \
                 -DCMAKE_BUILD_TYPE=Debug \
-                -DLINKER_SCRIPT="L1_MCU/STM32F429ZIT6_GCC/stm32f429zit6_flash.ld" \
-                -DMCU_MODEL="STM32F429ZIT6_GCC"\
+                -DMCU_MODEL="STM32F429ZIT6_GCC" \
                 -DUSE_FREERTOS=${{ matrix.config.freertos }} \
                 -DUSE_FATFS=OFF \
                 -DUSE_LVGL=${{ matrix.config.lvgl }}
@@ -96,12 +95,10 @@ jobs:
           cmake -B build -G Ninja `
                 -DCMAKE_TOOLCHAIN_FILE="cmake/gcc-arm-none-eabi.cmake" `
                 -DCMAKE_BUILD_TYPE=Debug `
-                -DLINKER_SCRIPT="L1_MCU/STM32F429ZIT6_GCC/stm32f429zit6_flash.ld" `
                 -DMCU_MODEL="STM32F429ZIT6_GCC" `
                 -DUSE_FREERTOS=${{ matrix.config.freertos }} `
                 -DUSE_FATFS=OFF `
-                -DUSE_LVGL=${{ matrix.config.lvgl }} `
-                -DUSE_LVGL_THORVG=${{ matrix.config.thorvg }}
+                -DUSE_LVGL=${{ matrix.config.lvgl }}
           ninja -C build
 
   test:

CMakeLists.txt

@@ -63,6 +63,8 @@ set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${CMAKE_PROJE
 # 添加子目录 
 add_subdirectory(L0_Assets)
 add_subdirectory(L1_MCU)
+# L1_MCU 子目录已生成链接脚本并更新了 LINKER_SCRIPT，在此应用
+target_link_options(${CMAKE_PROJECT_NAME} PRIVATE "-T${LINKER_SCRIPT}")
 add_subdirectory(L2_Core)  
 add_subdirectory(L3_Middlewares)  
 add_subdirectory(L4_Components)

L1_MCU/CMakeLists.txt

@@ -18,3 +18,11 @@ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${MCU_MODEL}")
 endif()
 
 add_subdirectory(${MCU_MODEL})
+
+# MCU 子目录通过 PARENT_SCOPE 设置了内存参数，生成链接脚本
+include(EkLinkerScript)
+ek_configure_linker_script()
+
+# 用生成的链接脚本覆盖工具链文件设置的默认值
+set(LINKER_SCRIPT "${EK_GENERATED_LINKER_SCRIPT}"
+    CACHE FILEPATH "The path to the linker script" FORCE)

L1_MCU/GD32F470ZGT6/CMakeLists.txt

@@ -36,3 +36,13 @@ target_compile_definitions(l1_mcu PUBLIC
     GD32F470
     $<$<CONFIG:Debug>:DEBUG>
 )
+
+# 链接脚本内存参数
+set(EK_FLASH_ORIGIN  "0x08000000" PARENT_SCOPE)
+set(EK_FLASH_LENGTH  "1024K"      PARENT_SCOPE)
+set(EK_RAM_ORIGIN    "0x20000000" PARENT_SCOPE)
+set(EK_RAM_LENGTH    "448K"       PARENT_SCOPE)
+set(EK_CCMRAM_ORIGIN "0x10000000" PARENT_SCOPE)
+set(EK_CCMRAM_LENGTH "64K"        PARENT_SCOPE)
+set(EK_SDRAM1_ORIGIN "0xC0000000" PARENT_SCOPE)
+set(EK_SDRAM1_LENGTH "32M"        PARENT_SCOPE)

L1_MCU/GD32F470ZGT6/gd32f470zgt6_flash.ld

@@ -32,3 +32,13 @@ target_compile_definitions(l1_mcu PUBLIC
     STM32F429xx
     $<$<CONFIG:Debug>:DEBUG>
 )
+
+# 链接脚本内存参数
+set(EK_FLASH_ORIGIN  "0x08000000" PARENT_SCOPE)
+set(EK_FLASH_LENGTH  "2048K"      PARENT_SCOPE)
+set(EK_RAM_ORIGIN    "0x20000000" PARENT_SCOPE)
+set(EK_RAM_LENGTH    "192K"       PARENT_SCOPE)
+set(EK_CCMRAM_ORIGIN "0x10000000" PARENT_SCOPE)
+set(EK_CCMRAM_LENGTH "64K"        PARENT_SCOPE)
+set(EK_SDRAM1_ORIGIN "0xD0000000" PARENT_SCOPE)
+set(EK_SDRAM1_LENGTH "8M"         PARENT_SCOPE)