Skip to content

Commit

Permalink
Merge branch 'master' into spi-update
Browse files Browse the repository at this point in the history
  • Loading branch information
GuEe-GUI authored Feb 11, 2025
2 parents 116af47 + f820c19 commit fd6486f
Show file tree
Hide file tree
Showing 1,644 changed files with 210,496 additions and 352,835 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/action_tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ on:
- '**/*.c'
- '**/*.h'
- '**/*.cpp'
workflow_dispatch:
repository_dispatch:

permissions:
contents: read # to fetch code (actions/checkout)
Expand Down Expand Up @@ -60,7 +62,12 @@ jobs:
- name: Build Tools
run: |
scons --pyconfig-silent -C $TEST_BSP_ROOT
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
scons -j$(nproc) -C $TEST_BSP_ROOT
- name: Project generate Tools
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/bsp_buildings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ jobs:
- "hc32l196"
- "mm32/mm32f3270-100ask-pitaya"
- "mm32f327x"
- "mm32f526x"
- "mm32l07x"
- "sam7x"
- "hk32/hk32f030c8-mini"
Expand All @@ -101,6 +102,7 @@ jobs:
- "rm48x50"
- "ht32/ht32f52352"
- "ht32/ht32f12366"
- "ht32/ht32f53252"
- "w60x"
- "essemi/es32f0654"
- "essemi/es32f365x"
Expand Down Expand Up @@ -189,6 +191,7 @@ jobs:
- "stm32/stm32h563-st-nucleo"
- "stm32/stm32h503-st-nucleo"
- "stm32/stm32h723-st-nucleo"
- "stm32/stm32h730-esphosted-evb"
- "stm32/stm32h743-armfly-v7"
- "stm32/stm32h743-atk-apollo"
- "stm32/stm32h743-openmv-h7plus"
Expand Down Expand Up @@ -231,6 +234,7 @@ jobs:
- "nxp/mcx/mcxn/frdm-mcxn947"
- "nxp/mcx/mcxn/frdm-mcxn236"
- "nxp/mcx/mcxa/frdm-mcxa153"
- "nxp/mcx/mcxa/frdm-mcxa156"
- "renesas/ebf_qi_min_6m5"
- "renesas/ra6m4-cpk"
- "renesas/ra6m4-iot"
Expand Down Expand Up @@ -349,6 +353,7 @@ jobs:
RTT_TOOL_CHAIN: "sourcery-riscv-none-embed"
SUB_RTT_BSP:
- "k210"
- "wch/risc-v/ch32v307v-r1"
- RTT_BSP: "riscv64-unknown"
RTT_TOOL_CHAIN: "sourcery-riscv64-unknown-elf"
SUB_RTT_BSP:
Expand Down Expand Up @@ -404,6 +409,7 @@ jobs:
wget https://raw.githubusercontent.com/RT-Thread/env/master/install_ubuntu.sh
chmod 777 install_ubuntu.sh
./install_ubuntu.sh
pip install -r tools/requirements.txt
git config --global http.postBuffer 524288000
echo "RTT_ROOT=${{ github.workspace }}" >> $GITHUB_ENV
echo "RTT_CC=gcc" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ jobs:
- name: generate doxygen html
shell: bash
run: |
cd documentation/doxygen
cd documentation
doxygen Doxyfile
cat Doxyfile
- name: Upload static files as artifact
id: deployment
uses: actions/upload-pages-artifact@main # or specific "vX.X.X" version tag for this action
with:
path: documentation/doxygen/html/
path: documentation/html/

deploy:
if: github.event_name == 'push'
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/spell_check.yml

This file was deleted.

7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ ncscope.*
tags

.idea
**/.cache/
.vscode
*.code-workspace
*.eide.*
Expand All @@ -57,4 +58,8 @@ vdso.lds

# cherryusb libraries
!components/drivers/usb/cherryusb/port/pusb2/*.a
!components/drivers/usb/cherryusb/port/xhci/phytium/*.a
!components/drivers/usb/cherryusb/port/xhci/phytium/*.a

# stm32cubemx
**/CubeMX_Config/Drivers/
**/CubeMX_Config/MDK-ARM/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Based on [STM32F103 BluePill](https://github.com/RT-Thread/rt-thread/tree/master
## Simulator

RT-Thread BSP can be compiled directly and downloaded to the corresponding development board for use. In addition, RT-Thread also provides qemu-vexpress-a9 BSP, which can be used without hardware platform. See the getting started guide below for details. Getting Started of QEMU with Env:
[Windows](documentation/quick-start/quick_start_qemu/quick_start_qemu.md) | [Linux Ubuntu](documentation/quick-start/quick_start_qemu/quick_start_qemu_linux.md) | [Mac OS](documentation/quick-start/quick_start_qemu/quick_start_qemu_macos.md)
[Windows](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_windows.md) | [Linux Ubuntu](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_linux.md) | [Mac OS](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_macos.md)

# License

Expand Down
2 changes: 1 addition & 1 deletion README_de.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Basierend auf [STM32F103 BluePill](https://github.com/RT-Thread/rt-thread/tree/m
## Simulator

Das RT-Thread BSP kann direkt kompiliert und zur Verwendung auf das entsprechende Entwicklungsboard heruntergeladen werden. Darüber hinaus bietet RT-Thread auch das qemu-vexpress-a9 BSP, das ohne Hardware-Plattform verwendet werden kann. Weitere Informationen finden Sie in der Anleitung für die ersten Schritte unten.
[Windows](documentation/quick-start/quick_start_qemu/quick_start_qemu.md) | [Linux Ubuntu](documentation/quick-start/quick_start_qemu/quick_start_qemu_linux.md) | [Mac OS](documentation/quick-start/quick_start_qemu/quick_start_qemu_macos.md)
[Windows](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_windows.md) | [Linux Ubuntu](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_linux.md) | [Mac OS](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_macos.md)

# Lizenz

Expand Down
2 changes: 1 addition & 1 deletion README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Basado en [STM32F103 BluePill](https://github.com/RT-Thread/rt-thread/tree/maste

## Simulator

El BSP de RT-Thread puede compilarse directamente y descargarse en la placa de desarrollo correspondiente para su uso. Además, RT-Thread también proporciona el BSP qemu-vexpress-a9, que puede utilizarse sin plataforma de hardware. Consulte la guía de inicio más abajo para más detalles. [Windows](documentation/quick-start/quick_start_qemu/quick_start_qemu.md) | [Linux Ubuntu](documentation/quick-start/quick_start_qemu/quick_start_qemu_linux.md) | [Mac OS](documentation/quick-start/quick_start_qemu/quick_start_qemu_macos.md)
El BSP de RT-Thread puede compilarse directamente y descargarse en la placa de desarrollo correspondiente para su uso. Además, RT-Thread también proporciona el BSP qemu-vexpress-a9, que puede utilizarse sin plataforma de hardware. Consulte la guía de inicio más abajo para más detalles. [Windows](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_windows.md) | [Linux Ubuntu](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_linux.md) | [Mac OS](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_macos.md)

# Licencia

Expand Down
4 changes: 2 additions & 2 deletions README_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ RT-Thread Studio演示:

RT-Thread BSP可以直接编译并下载到相应的开发板使用。此外,RT-Thread还提供 qemu-vexpress-a9 BSP,无需硬件平台即可使用。有关详细信息,请参阅下面的入门指南。

[QEMU 入门指南(Windows)](documentation/quick-start/quick_start_qemu/quick_start_qemu.md)
[QEMU 入门指南(Windows)](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_windows.md)

[QEMU 入门指南(Ubuntu)](documentation/quick-start/quick_start_qemu/quick_start_qemu_linux.md)
[QEMU 入门指南(Ubuntu)](documentation/2.quick-start/quick_start_qemu/quick_start_qemu_linux.md)


## 文档
Expand Down
6 changes: 2 additions & 4 deletions bsp/cvitek/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cvitek_bootloader
fip.bin
boot.sd
output
rttpkgtool/
output/
Image.lzma
8 changes: 5 additions & 3 deletions bsp/cvitek/README.md
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,11 @@ export RTT_EXEC_PATH=/opt/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin
## 4.2. 依赖安装

```shell
$ sudo apt install -y scons libncurses5-dev device-tree-compiler
$ sudo apt install -y scons libncurses5-dev device-tree-compiler u-boot-tools xz-utils
```

其中 u-boot-tools 包含了打包需要的 mkimage, xz-utils 包含了打包需要的 lzma。

## 4.3. 构建

异构芯片需单独编译每个核的 OS,在大/小核对应的目录下,依次执行:
Expand Down Expand Up @@ -284,7 +286,7 @@ lwIP-2.1.2 initialized!
found part[0], begin: 1048576, size: 128.0MB
found part[1], begin: 135266304, size: 28.707GB
[I/app.filesystem] device 'sd1' is mounted to '/' as FAT
Hello RT-Smart!
Hello RISC-V/C906B !
msh />[E/sal.skt] not find network interface device by protocol family(1).
[E/sal.skt] SAL socket protocol family input failed, return error -3.
/ # ls
Expand All @@ -310,7 +312,7 @@ lwIP-2.1.2 initialized!
found part[0], begin: 1048576, size: 128.0MB
found part[1], begin: 135266304, size: 28.707GB
[I/app.filesystem] device 'sd1' is mounted to '/' as EXT
Hello RT-Smart!
Hello RISC-V/C906B !
msh />[E/sal.skt] not find network interface device by protocol family(1).
[E/sal.skt] SAL socket protocol family input failed, return error -3.
/ # ls
Expand Down
44 changes: 0 additions & 44 deletions bsp/cvitek/board_env.sh

This file was deleted.

68 changes: 68 additions & 0 deletions bsp/cvitek/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#!/bin/bash

source ./tools.sh

function usage() {
echo "Usage:"
echo " ./build.sh [-h|-l|-b]"
echo " -h: display usage"
echo " -l: build c906L"
echo " -b: build c906B"
}

function build_c906b() {
echo "build_c906b"

BOARD_TYPE=`get_board_type $BSP_PATH/cv18xx_risc-v`
echo "BOARD_TYPE: $BOARD_TYPE"

DPT_PATH_KERNEL=$BSP_PATH/../../ DPT_BOARD_TYPE=$BOARD_TYPE DPT_PATH_OUTPUT=$BSP_PATH/output ./rttpkgtool/script/mkpkg.sh -b
}

function build_c906l() {
echo "build_c906l"

BOARD_TYPE=`get_board_type $BSP_PATH/c906_little`
echo "BOARD_TYPE: $BOARD_TYPE"

DPT_PATH_KERNEL=$BSP_PATH/../../ DPT_BOARD_TYPE=$BOARD_TYPE DPT_PATH_OUTPUT=$BSP_PATH/output ./rttpkgtool/script/mkpkg.sh -l
}

while getopts ":hbl" opt
do
case $opt in
h)
O_HELP=y
;;
b)
O_MAKE_BIG=y
;;
l)
O_MAKE_LITTLE=y
;;
?)
echo "Unrecognized parameter."
usage
exit 1
;;
esac
done

if [ "$O_HELP" = "y" ]; then
usage
exit 0
fi

BSP_PATH=$(realpath $(dirname $0))
echo "BSP_PATH: $BSP_PATH"

download_rttpkgtool $BSP_PATH

if [ "$O_MAKE_BIG" = "y" ]; then
build_c906b
fi

if [ "$O_MAKE_LITTLE" = "y" ]; then
build_c906l
fi

1 change: 1 addition & 0 deletions bsp/cvitek/c906_little/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ config BSP_USING_C906_LITTLE
bool
select ARCH_RISCV64
select ARCH_RISCV_FPU_D
select RT_USING_CACHE
select RT_USING_COMPONENTS_INIT
select RT_USING_USER_MAIN
default y
Expand Down
2 changes: 1 addition & 1 deletion bsp/cvitek/c906_little/applications/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

int main(void)
{
rt_kprintf("Hello, RISC-V!\n");
rt_kprintf("Hello, RISC-V/C906L !\n");

return 0;
}
2 changes: 2 additions & 0 deletions bsp/cvitek/c906_little/board/board.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#include <rtthread.h>

#include "board.h"
#include "tick.h"
#include "drv_uart.h"

void rt_hw_board_init(void)
{
Expand Down
Loading

0 comments on commit fd6486f

Please sign in to comment.