Merge branch 'RT-Thread:master' into use_rttpkgtool_for_aarch64

Author: jojoandgyc

.github/workflows/action_tools.yml

@@ -62,12 +62,14 @@ jobs:
 
     - name: Build Tools
       run: |
+        source ~/.env/env.sh
         scons --pyconfig-silent -C $TEST_BSP_ROOT 2>menuconfig.log
         cat menuconfig.log
         if grep -q "warning:" menuconfig.log; then
           echo "Errors found in menuconfig, failing the build."
           exit 1
         fi
+        pushd $TEST_BSP_ROOT && pkgs --update && popd
         scons -j$(nproc) -C $TEST_BSP_ROOT
 
     - name: Project generate Tools

.github/workflows/bsp_buildings.yml

@@ -1,3 +1,12 @@
+#
+# Copyright (c) 2025, RT-Thread Development Team
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Change Logs:
+# Date           Author       Notes
+# 2025-03-22     Supperthomas 添加upload 上传编译固件
+#
 name: RT-Thread BSP Static Build Check
 
 # Controls when the action will run. Triggers the workflow on push or pull request
@@ -41,11 +50,11 @@ jobs:
             RTT_TOOL_CHAIN: "sourcery-arm"
             SUB_RTT_BSP:
                 - "stm32/stm32f407-rt-spark"
-         -  RTT_BSP: "RTduino/Arduino Libraries (STM32F412 Nucleo)"
+         -  RTT_BSP: "RTduino_Arduino Libraries (STM32F412 Nucleo)"
             RTT_TOOL_CHAIN: "sourcery-arm"
             SUB_RTT_BSP:
                 - "stm32/stm32f412-st-nucleo"
-         -  RTT_BSP: "RTduino/Arduino Libraries (Raspberry Pico)"
+         -  RTT_BSP: "RTduino_Arduino Libraries (Raspberry Pico)"
             RTT_TOOL_CHAIN: "sourcery-arm"
             SUB_RTT_BSP:
                 - "raspberry-pico"
@@ -192,6 +201,7 @@ jobs:
                 - "stm32/stm32f767-st-nucleo"
                 - "stm32/stm32f769-st-disco"
                 - "stm32/stm32f723-st-disco"
+                - "stm32/stm32g030-tiny-board"
                 - "stm32/stm32g070-st-nucleo"
                 - "stm32/stm32g071-st-nucleo"
                 - "stm32/stm32g431-st-nucleo"
@@ -432,22 +442,22 @@ jobs:
         id: cache-gcc-arm
         uses: actions/cache@main
         with:
-          path: /opt/gcc-arm-none-eabi-10-2020-q4-major
-          key: ${{ runner.os }}-arm-none-eabi-10-2020-q4-major
+          path: /opt/arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi
+          key: ${{ runner.os }}-arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi
 
       - name: Download Arm ToolChains
         if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-arm' && (steps.cache-gcc-arm.outputs.cache-hit != 'true') }}
         shell: bash
         run: |
-          wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.3/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
-          sudo tar xjf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2 -C /opt
+          wget -q https://github.com/RT-Thread/toolchains-ci/releases/download/v1.8/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
+          sudo tar -xf arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz -C /opt
 
       - name: Install Arm ToolChains2
         if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-arm'}}
         shell: bash
         run: |
-          /opt/gcc-arm-none-eabi-10-2020-q4-major/bin/arm-none-eabi-gcc --version
-          echo "RTT_EXEC_PATH=/opt/gcc-arm-none-eabi-10-2020-q4-major/bin" >> $GITHUB_ENV
+          /opt/arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi/bin/arm-none-eabi-gcc --version
+          echo "RTT_EXEC_PATH=/opt/arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi/bin" >> $GITHUB_ENV
 
       - name: Install LLVM-Arm ToolChains
         if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'llvm-arm' && success() }}
@@ -535,9 +545,36 @@ jobs:
           source ~/.env/env.sh
           python tools/ci/bsp_buildings.py
 
+      - name: Upload output as artifact
+        if: ${{ success() }}
+        uses: actions/upload-artifact@main
+        with:
+          name: ${{ matrix.legs.RTT_BSP }}
+          if-no-files-found: ignore
+          path: output/
+
       - name: Post failure comment
         if: failure()
         run: |
           curl -X POST -H "Authorization: token ${{ secrets.RTTHREAD_GITHUB_TOKEN }}" \
           -d '{"body":"@${{ github.actor }}, Thank you for your contribution, but there was an error with the action. Could you please help check the BSP compilation issue? Thank you."}' \
           "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"
+  # 整合所有的output为一个文件夹 
+  collect-artifacts:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request' #排除Pull request
+    steps:
+      #这里会下载所有产物
+      - name: Download all artifacts
+        uses: actions/download-artifact@main
+        with:
+          path: output/
+          merge-multiple: true
+      - run: ls -R output/
+
+      - name: Upload combined output as artifact
+        uses: actions/upload-artifact@main
+        with:
+          name: 00_all_bsp_output_${{ github.sha }}  
+          path: output/

bsp/at32/tools/sdk_dist.py

@@ -28,10 +28,11 @@ def dist_do_building(BSP_ROOT, dist_dir):
     print("=> copy at32 bsp library")
     library_dir = os.path.join(dist_dir, 'libraries')
     library_path = os.path.join(os.path.dirname(BSP_ROOT), 'libraries')
-    bsp_copy_files(
-        os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE),
-        os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE),
-    )
+    if rtconfig.BSP_LIBRARY_TYPE is not None:
+        bsp_copy_files(
+            os.path.join(library_path, rtconfig.BSP_LIBRARY_TYPE),
+            os.path.join(library_dir, rtconfig.BSP_LIBRARY_TYPE),
+        )
 
     print("=> copy bsp drivers")
     bsp_copy_files(os.path.join(library_path, 'rt_drivers'), os.path.join(library_dir, 'rt_drivers'))

bsp/cvitek/README.md

@@ -350,8 +350,16 @@ $ sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
 
 3. 如发现切换开发板编译正常，但无法正常打包，请切换至自动下载的 `cvi_bootloader` 目录，并手工运行 `git pull` 更新，或删除该目录后重新自动下载。
 
+4. 有关配置 pinmux（管脚复用）的通用方法, 以 duo256m 配置大核（`bsp/cvitek/cv18xx_risc-v`）的 UART0 输出为例。
+   - duo256m 控制台默认使用 UART0。查看 [duo256m 的板级输出引脚定义](https://milkv.io/docs/duo/getting-started/duo256m#gpio-pinout)，找到 UART0 的 `UART0_RX` 和 `UART0_TX` 对应板上引脚为 `GP13`（`XGPIOA[17]`） 和 `GP12`（`XGPIOA[16]`）。这也是我们需要连接串口线的引脚。
+   - duo256m 使用的 SoC 为 SG2002。查看 [SG2002 TRM 手册的 "CHAPTER 10 管脚复用与控制"](https://github.com/sophgo/sophgo-doc/releases)，TRM 让我们查看在线表格: <https://github.com/sophgo/sophgo-hardware/blob/master/SG200X/04_SG2002/04_SG2002_PINOUT.xls>。在 “1. 管脚信息表(QFN)” 那一页，对于 `UART0_RX`，我们搜索 “`XGPIOA[17]`” 可以找到其所在行的 "Pin Name" 那一列的值是 “`UART0_RX`”；对于 `UART0_TX`，我们搜索 “XGPIOA[16]” 可以找到其所在行的 "Pin Name" 那一列的值是 “`UART0_TX`”。***注意，这里对于 UART0，duo256m 的 “Pin Name” 和板上引脚中的 UART 信息字符串正好一致，但其他的外设就不一定了。具体的 “Pin Name” 以 xls 表格上的为准***。
+   - 执行 `scons --menuconfig`, 进入 “(Top) → General Drivers Configuration → Using UART”，设置 “uart0 rx pin name” 为 “UART0_RX”；设置 “uart0 tx pin name” 为 “UART0_TX”。这也是目前默认的配置。
+
 # 8. 联系人信息
 
-维护人：[flyingcys](https://github.com/flyingcys)
+维护人：
+
+- [flyingcys](https://github.com/flyingcys)
+- Chen Wang <[email protected]>
 
 更多信息请参考 [https://riscv-rtthread-programming-manual.readthedocs.io](https://riscv-rtthread-programming-manual.readthedocs.io)

bsp/cvitek/drivers/drv_spi.c

@@ -73,7 +73,6 @@ static rt_err_t spi_configure(struct rt_spi_device *device, struct rt_spi_config
     RT_ASSERT(device->bus->parent.user_data != RT_NULL);
     RT_ASSERT(cfg != RT_NULL);
 
-    rt_err_t ret = RT_EOK;
     struct _device_spi *spi = (struct _device_spi *)device->bus->parent.user_data;
     struct dw_spi *dws = &spi->dws;
 
@@ -139,9 +138,6 @@ static rt_err_t spi_configure(struct rt_spi_device *device, struct rt_spi_config
 
 static rt_err_t dw_spi_transfer_one(struct dw_spi *dws, const void *tx_buf, void *rx_buf, uint32_t len, enum transfer_type  tran_type)
 {
-    uint8_t imask = 0;
-    uint16_t txlevel = 0;
-
     dws->tx = NULL;
     dws->tx_end = NULL;
     dws->rx = NULL;
@@ -198,7 +194,7 @@ static rt_ssize_t spi_xfer(struct rt_spi_device *device, struct rt_spi_message *
 
     struct _device_spi *spi = (struct _device_spi *)device->bus->parent.user_data;
     struct dw_spi *dws = &spi->dws;
-    int32_t ret = 0;
+    int32_t ret = RT_EOK;
 
     if (message->send_buf && message->recv_buf)
     {
@@ -214,6 +210,14 @@ static rt_ssize_t spi_xfer(struct rt_spi_device *device, struct rt_spi_message *
     {
         ret = dw_spi_transfer_one(dws, RT_NULL, message->recv_buf, message->length, POLL_TRAN);
 
+    } else {
+        return 0;
+    }
+
+    if (ret != RT_EOK)
+    {
+        LOG_E("spi transfer error : %d", ret);
+        return 0;
     }
 
     return message->length;
@@ -329,13 +333,12 @@ static void rt_hw_spi_pinmux_config()
 int rt_hw_spi_init(void)
 {
     rt_err_t ret = RT_EOK;
-    struct dw_spi *dws;
 
     rt_hw_spi_pinmux_config();
 
     for (rt_size_t i = 0; i < sizeof(_spi_obj) / sizeof(struct _device_spi); i++)
     {
-        _spi_obj[i].base_addr = (rt_ubase_t)DRV_IOREMAP((void *)_spi_obj[i].base_addr, 0x1000);
+        _spi_obj[i].dws.regs = (void *)DRV_IOREMAP((void *)_spi_obj[i].dws.regs, 0x1000);
 
         _spi_obj[i].spi_bus.parent.user_data = (void *)&_spi_obj[i];
         ret = rt_spi_bus_register(&_spi_obj[i].spi_bus, _spi_obj[i].device_name, &_spi_ops);

bsp/cvitek/drivers/libraries/spi/dw_spi.c

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 #include <errno.h>
+#include <rtthread.h>
 #include <string.h>
 #include <stdio.h>
 
@@ -23,9 +24,12 @@
 #include <rthw.h>
 
 #ifdef SPI_DEBUG
-#define SP_DEBUG_LOG    printf
+#define SP_DEBUG_LOG(fmt, ...) \
+    do { \
+        rt_kprintf(fmt, ##__VA_ARGS__); \
+    } while(0)
 #else
-#define SP_DEBUG_LOG
+#define SP_DEBUG_LOG(fmt, ...)
 #endif
 
 /* Restart the controller, disable all interrupts, clean rx fifo */

bsp/nrf5x/nrf52833/rtconfig.py

@@ -55,7 +55,8 @@
         CFLAGS += ' -O2'
 
     POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
-
+    POST_ACTION += OBJCPY + ' -O ihex $TARGET rt-thread.hex\n'
+    
 elif PLATFORM == 'armcc':
     # toolchains
     CC = 'armcc'

bsp/nrf5x/nrf52840/rtconfig.py

@@ -55,7 +55,8 @@
         CFLAGS += ' -O2'
 
     POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n'
-
+    POST_ACTION += OBJCPY + ' -O ihex $TARGET rt-thread.hex\n'
+    
 elif PLATFORM == 'armcc':
     # toolchains
     CC = 'armcc'

bsp/stm32/libraries/Kconfig

@@ -25,6 +25,7 @@ config SOC_SERIES_STM32F4
     bool
     select ARCH_ARM_CORTEX_M4
     select SOC_FAMILY_STM32
+    select PKG_USING_STM32F4_HAL_DRIVER
 
 config SOC_SERIES_STM32F7
     bool