From 0aa12fab4e1b345379f7837d07b54d242a618340 Mon Sep 17 00:00:00 2001 From: flyingcys Date: Tue, 1 Oct 2024 10:06:11 +0800 Subject: [PATCH 1/2] [bsp/cvitek]:fix drv_eth error && add ci Signed-off-by: flyingcys --- .github/workflows/bsp_buildings.yml | 12 ++++++++++ bsp/cvitek/cv18xx_risc-v/.config | 35 ++++++++++++++++++++++++++--- bsp/cvitek/cv18xx_risc-v/rtconfig.h | 7 ++++++ bsp/cvitek/drivers/drv_eth.c | 2 +- 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml index 59fac313e75..cfe28a13033 100644 --- a/.github/workflows/bsp_buildings.yml +++ b/.github/workflows/bsp_buildings.yml @@ -383,6 +383,10 @@ jobs: RTT_TOOL_CHAIN: "sourcery-i386-unknown-elf" SUB_RTT_BSP: - "x86" + - RTT_BSP: "xuantie-900" + RTT_TOOL_CHAIN: "sourcery-Xuantie-900-gcc-elf" + SUB_RTT_BSP: + - "cvitek/c906_little" steps: - uses: actions/checkout@v4 - name: Set up Python @@ -485,6 +489,14 @@ jobs: /opt/i386-unknown-elf_for_x86_64-pc-linux-gnu/bin/i386-unknown-elf-gcc --version echo "RTT_EXEC_PATH=/opt/i386-unknown-elf_for_x86_64-pc-linux-gnu/bin" >> $GITHUB_ENV + - name: Install Xuantie-900-gcc-elf Tools + if: ${{ matrix.legs.RTT_TOOL_CHAIN == 'sourcery-Xuantie-900-gcc-elf' && success() }} + run: | + wget -q https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource//1705395512373/Xuantie-900-gcc-elf-newlib-x86_64-V2.8.1-20240115.tar.gz + sudo tar -zxvf Xuantie-900-gcc-elf-newlib-x86_64-V2.8.1-20240115.tar.gz -C /opt + /opt/Xuantie-900-gcc-elf-newlib-x86_64-V2.8.1/bin/riscv64-unknown-elf-gcc --version + echo "RTT_EXEC_PATH=/opt/Xuantie-900-gcc-elf-newlib-x86_64-V2.8.1/bin" >> $GITHUB_ENV + - name: Bsp Scons Compile if: ${{ success() }} shell: bash diff --git a/bsp/cvitek/cv18xx_risc-v/.config b/bsp/cvitek/cv18xx_risc-v/.config index c9c54d5e4d0..d0cd227cf94 100644 --- a/bsp/cvitek/cv18xx_risc-v/.config +++ b/bsp/cvitek/cv18xx_risc-v/.config @@ -99,6 +99,7 @@ CONFIG_ARCH_RISCV=y CONFIG_ARCH_RISCV_FPU=y CONFIG_ARCH_RISCV_FPU_D=y CONFIG_ARCH_RISCV64=y +CONFIG_ARCH_USING_NEW_CTX_SWITCH=y CONFIG_ARCH_USING_RISCV_COMMON64=y # @@ -431,6 +432,7 @@ CONFIG_RT_USING_ADT_REF=y # CONFIG_PKG_USING_WEBTERMINAL is not set # CONFIG_PKG_USING_FREEMODBUS is not set # CONFIG_PKG_USING_NANOPB is not set +# CONFIG_PKG_USING_WIFI_HOST_DRIVER is not set # # Wi-Fi @@ -535,6 +537,7 @@ CONFIG_RT_USING_ADT_REF=y # CONFIG_PKG_USING_ZEPHYR_POLLING is not set # CONFIG_PKG_USING_MATTER_ADAPTATION_LAYER is not set # CONFIG_PKG_USING_LHC_MODBUS is not set +# CONFIG_PKG_USING_QMODBUS is not set # end of IoT - internet of things # @@ -562,6 +565,7 @@ CONFIG_RT_USING_ADT_REF=y # CONFIG_PKG_USING_JSMN is not set # CONFIG_PKG_USING_AGILE_JSMN is not set # CONFIG_PKG_USING_PARSON is not set +# CONFIG_PKG_USING_RYAN_JSON is not set # end of JSON: JavaScript Object Notation, a lightweight data-interchange format # @@ -680,6 +684,8 @@ CONFIG_RT_USING_ADT_REF=y # CONFIG_PKG_USING_RT_VSNPRINTF_FULL is not set # end of enhanced kernel services +# CONFIG_PKG_USING_AUNITY is not set + # # acceleration: Assembly language or algorithmic acceleration packages # @@ -770,11 +776,29 @@ CONFIG_RT_USING_ADT_REF=y # # STM32 HAL & SDK Drivers # -# CONFIG_PKG_USING_STM32L4XX_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set +# CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set +# CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set # CONFIG_PKG_USING_STM32WB55_SDK is not set # CONFIG_PKG_USING_STM32_SDIO is not set # end of STM32 HAL & SDK Drivers +# +# Infineon HAL Packages +# +# CONFIG_PKG_USING_INFINEON_CAT1CM0P is not set +# CONFIG_PKG_USING_INFINEON_CMSIS is not set +# CONFIG_PKG_USING_INFINEON_CORE_LIB is not set +# CONFIG_PKG_USING_INFINEON_MTB_HAL_CAT1 is not set +# CONFIG_PKG_USING_INFINEON_MTB_PDL_CAT1 is not set +# CONFIG_PKG_USING_INFINEON_RETARGET_IO is not set +# CONFIG_PKG_USING_INFINEON_CAPSENSE is not set +# CONFIG_PKG_USING_INFINEON_CSDIDAC is not set +# CONFIG_PKG_USING_INFINEON_SERIAL_FLASH is not set +# CONFIG_PKG_USING_INFINEON_USBDEV is not set +# end of Infineon HAL Packages + # CONFIG_PKG_USING_BLUETRUM_SDK is not set # CONFIG_PKG_USING_EMBARC_BSP is not set # CONFIG_PKG_USING_ESP_IDF is not set @@ -948,6 +972,7 @@ CONFIG_RT_USING_ADT_REF=y # CONFIG_PKG_USING_SYSTEM_RUN_LED is not set # CONFIG_PKG_USING_BT_MX01 is not set # CONFIG_PKG_USING_RGPOWER is not set +# CONFIG_PKG_USING_BT_MX02 is not set # CONFIG_PKG_USING_SPI_TOOLS is not set # end of peripheral libraries and drivers @@ -969,6 +994,7 @@ CONFIG_RT_USING_ADT_REF=y # # Signal Processing and Control Algorithm Packages # +# CONFIG_PKG_USING_APID is not set # CONFIG_PKG_USING_FIRE_PID_CURVE is not set # CONFIG_PKG_USING_QPID is not set # CONFIG_PKG_USING_UKAL is not set @@ -1056,6 +1082,7 @@ CONFIG_RT_USING_ADT_REF=y # CONFIG_PKG_USING_ARDUINO_MSGQ_C_CPP_DEMO is not set # CONFIG_PKG_USING_ARDUINO_SKETCH_LOADER_DEMO is not set # CONFIG_PKG_USING_ARDUINO_ULTRASOUND_RADAR is not set +# CONFIG_PKG_USING_ARDUINO_RTDUINO_SENSORFUSION_SHIELD is not set # CONFIG_PKG_USING_ARDUINO_NINEINONE_SENSOR_SHIELD is not set # CONFIG_PKG_USING_ARDUINO_SENSOR_KIT is not set # CONFIG_PKG_USING_ARDUINO_MATLAB_SUPPORT is not set @@ -1297,10 +1324,11 @@ CONFIG_BSP_UART_IRQ_BASE=44 # CONFIG_BSP_USING_ADC is not set # CONFIG_BSP_USING_SPI is not set # CONFIG_BSP_USING_WDT is not set +# CONFIG_BSP_USING_TIMER is not set # CONFIG_BSP_USING_PWM is not set # CONFIG_BSP_USING_RTC is not set -# CONFIG_BSP_USING_SDH is not set -# CONFIG_BSP_USING_ETH is not set +CONFIG_BSP_USING_SDH=y +CONFIG_BSP_USING_ETH=y # end of General Drivers Configuration CONFIG_BSP_USING_CV18XX=y @@ -1314,5 +1342,6 @@ CONFIG_SOC_TYPE_SG2002=y # CONFIG_BOARD_TYPE_MILKV_DUO_SPINOR is not set CONFIG_BOARD_TYPE_MILKV_DUO256M=y # CONFIG_BOARD_TYPE_MILKV_DUO256M_SPINOR is not set +# CONFIG_BOARD_TYPE_MILKV_DUOS is not set CONFIG_BSP_ROOTFS_TYPE_ROMFS=y # CONFIG_BSP_ROOTFS_TYPE_CROMFS is not set diff --git a/bsp/cvitek/cv18xx_risc-v/rtconfig.h b/bsp/cvitek/cv18xx_risc-v/rtconfig.h index 8792605247d..222567abc73 100755 --- a/bsp/cvitek/cv18xx_risc-v/rtconfig.h +++ b/bsp/cvitek/cv18xx_risc-v/rtconfig.h @@ -68,6 +68,7 @@ #define ARCH_RISCV_FPU #define ARCH_RISCV_FPU_D #define ARCH_RISCV64 +#define ARCH_USING_NEW_CTX_SWITCH #define ARCH_USING_RISCV_COMMON64 /* RT-Thread Components */ @@ -357,6 +358,10 @@ /* end of STM32 HAL & SDK Drivers */ +/* Infineon HAL Packages */ + +/* end of Infineon HAL Packages */ + /* Kendryte SDK */ /* end of Kendryte SDK */ @@ -447,6 +452,8 @@ #define BSP_UART0_RX_PINNAME "UART0_RX" #define BSP_UART0_TX_PINNAME "UART0_TX" #define BSP_UART_IRQ_BASE 44 +#define BSP_USING_SDH +#define BSP_USING_ETH /* end of General Drivers Configuration */ #define BSP_USING_CV18XX #define C906_PLIC_PHY_ADDR 0x70000000 diff --git a/bsp/cvitek/drivers/drv_eth.c b/bsp/cvitek/drivers/drv_eth.c index d25b395a116..f1ae89aa51c 100644 --- a/bsp/cvitek/drivers/drv_eth.c +++ b/bsp/cvitek/drivers/drv_eth.c @@ -256,7 +256,7 @@ static rt_err_t rt_dw_eth_init(rt_device_t dev) } else { - err = -RT_ERROR; + return -RT_ERROR; } return RT_EOK; From 7a8df08e5651b70cd817779702f8c52d8f44ec1a Mon Sep 17 00:00:00 2001 From: Supper Thomas <78900636@qq.com> Date: Thu, 3 Oct 2024 14:38:57 +0800 Subject: [PATCH 2/2] Update bsp_buildings.yml --- .github/workflows/bsp_buildings.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml index cfe28a13033..0dfe7f7381c 100644 --- a/.github/workflows/bsp_buildings.yml +++ b/.github/workflows/bsp_buildings.yml @@ -383,9 +383,9 @@ jobs: RTT_TOOL_CHAIN: "sourcery-i386-unknown-elf" SUB_RTT_BSP: - "x86" - - RTT_BSP: "xuantie-900" - RTT_TOOL_CHAIN: "sourcery-Xuantie-900-gcc-elf" - SUB_RTT_BSP: + - RTT_BSP: "xuantie-900" + RTT_TOOL_CHAIN: "sourcery-Xuantie-900-gcc-elf" + SUB_RTT_BSP: - "cvitek/c906_little" steps: - uses: actions/checkout@v4 @@ -513,4 +513,4 @@ jobs: 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" \ No newline at end of file + "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments"