Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bsp][wch] move ch32v307 sdk to package #9983

Merged
merged 7 commits into from
Feb 19, 2025
Merged

[bsp][wch] move ch32v307 sdk to package #9983

merged 7 commits into from
Feb 19, 2025

Conversation

kaidegit
Copy link
Contributor

拉取/合并请求描述：(PR description)

[

为什么提交这份PR (why to submit this PR)

#9960 (comment)

你的解决方案是什么 (what is your solution)

上游sdk+patch形式制作软件包

请提供验证的bsp和config (provide the config and bsp)

  • BSP: 源地v307核心板（yd-ch32v307vct6）

  • .config:

  • action:

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality：

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确，包括缩进空格，命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码，代码尽量精简，不包含#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的，并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/workflows/bsp_buildings.yml 详细请参考链接BSP自查（ci似乎还没有准备好wch的工具链）

@github-actions github-actions bot added BSP BSP: WCH BSP related with WCH labels Feb 10, 2025
@supperthomas
Copy link
Member

感谢pr，ci加一下

1 similar comment
@supperthomas
Copy link
Member

感谢pr，ci加一下

@kaidegit
Copy link
Contributor Author

感谢pr，ci加一下

工具链帮忙加一下到你们的release里面吧

http://www.mounriver.com/download

@supperthomas
Copy link
Member

#9984

参加一下，等合并之后rebase一下即可

@kaidegit
Copy link
Contributor Author

这个带wch快速中断的适配居然能过一般的gcc

@Rbb666
Copy link
Member

Rbb666 commented Feb 11, 2025

#9984 已经合并了

@kaidegit
[bsp][wch] use a fixed version
bdf5205
@kaidegit
Merge branch 'pr-wch-sdk-as-pkg' of https://github.com/kaidegit/rt-th…
930667e 
…read into pr-wch-sdk-as-pkg

# Conflicts:
#	bsp/wch/risc-v/yd-ch32v307vct6/.config   resolved by pr-wch-sdk-as-pkg version
#	bsp/wch/risc-v/yd-ch32v307vct6/rtconfig.h
@kaidegit
[bsp][wch]fix: ch32v307v-r1 build
5d9afcb
@kaidegit kaidegit mentioned this pull request Feb 11, 2025
Open
@kaidegit
Copy link
Contributor Author

ci估计要package那边合了才能过

@Rbb666
Copy link
Member

Rbb666 commented Feb 12, 2025

ci估计要package那边合了才能过

RT-Thread/packages#1858 (comment)

@supperthomas
Copy link
Member

@kaidegit

@github-actions github-actions bot added the action github action yml imporve label Feb 18, 2025
supperthomas
supperthomas requested changes Feb 18, 2025
View reviewed changes
bsp/wch/risc-v/yd-ch32v307vct6/rtconfig.py Outdated
@@ -10,7 +10,7 @@

if CROSS_TOOL == 'gcc':
PLATFORM = 'gcc'
EXEC_PATH = r'/opt/MRS_Toolchain_Linux_x64_V1.90/RISC-V_Embedded_GCC/bin/'
EXEC_PATH = r'C:\Users\yekai\Documents\DevTools\wch-riscv-none-elf-gcc-8\bin'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
EXEC_PATH = r'C:\Users\yekai\Documents\DevTools\wch-riscv-none-elf-gcc-8\bin'
EXEC_PATH = r'/opt/MRS_Toolchain_Linux_x64_V1.90/RISC-V_Embedded_GCC/bin/''

这里路径改一下，不要用绝对路径

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个toolchain应该是开发者自己填的吧？
而且应该是从mrs捞出来的或者自己下的，怎么不绝对

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

有可能是linux的，让客户自己自行设置即可，可以设置环境变量。总之你这里yekai之类的不建议出现的。恢复回去就行了。

supperthomas
supperthomas requested changes Feb 18, 2025
View reviewed changes
bsp/wch/risc-v/yd-ch32v307vct6/rtconfig.py Outdated
@@ -10,7 +10,7 @@

if CROSS_TOOL == 'gcc':
PLATFORM = 'gcc'
EXEC_PATH = r'/opt/MRS_Toolchain_Linux_x64_V1.90/RISC-V_Embedded_GCC/bin/'
EXEC_PATH = r'C:\Users\yekai\Documents\DevTools\wch-riscv-none-elf-gcc-8\bin'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

有可能是linux的，让客户自己自行设置即可，可以设置环境变量。总之你这里yekai之类的不建议出现的。恢复回去就行了。

@supperthomas
Copy link
Member

rt-thread/bsp/stm32/stm32l496-st-nucleo/rtconfig.py

Lines 18 to 30 in 4b25b5e

if CROSS_TOOL == 'gcc':
PLATFORM = 'gcc'
EXEC_PATH = r'.'
elif CROSS_TOOL == 'keil':
PLATFORM = 'armclang' #KEIL A6
#PLATFORM = 'armcc' #KEIL A5
EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar':
PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH') and CROSS_TOOL == 'gcc':
EXEC_PATH = os.getenv('RTT_EXEC_PATH')

或者你可以参考下这个改法。

@kaidegit
Copy link
Contributor Author

或者你可以参考下这个改法。

现在的和这个有区别吗？本身wch的rv就只有gcc

@supperthomas
Copy link
Member

@liYony

@supperthomas supperthomas added the +1 Agree +1 label Feb 18, 2025
@supperthomas
Copy link
Member

感谢pr

@supperthomas supperthomas merged commit 3251a12 into RT-Thread:master Feb 19, 2025
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@supperthomas supperthomas supperthomas approved these changes

@Rbb666 Rbb666 Rbb666 approved these changes

@mysterywolf mysterywolf Awaiting requested review from mysterywolf

Assignees
No one assigned
Labels
action github action yml imporve BSP: WCH BSP related with WCH BSP +1 Agree +1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kaidegit @supperthomas @Rbb666