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.

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

bsp: cvitek: use new rttpkgtool to replace old cvitek_bootloader #9949

Merged
merged 2 commits into from
Jan 26, 2025

Conversation

unicornx
Copy link
Contributor

@unicornx unicornx commented Jan 24, 2025

Fixed #9060

为了方便 review,本 PR 分为两个 patch

  • ”bsp: cvitek: use rttpkgtool to replace cvitek_bootloader“: 修改脚本,使用 rttpkgtool
  • "bsp: cvitek: removed useless files after using rttpkgtool": 清理删除了一些不需要的文件。

原先对于 bsp/cvitek 下的 riscv 的大小核,在生成 rtthread.bin 后会使用 cvitek_bootloader 这个工具将其打包生成最终可以烧写进 sdcard的 fip.bin 和 boot.sd 文件。但是 cvitek_bootloader 这个工具仓库体积比较大,是从源码级别编译生成 fsbl,opensbi 和 uboot 等固件。而且使用时需要下载到 bsp/cvitek 目录下,对原有工作路径下的 RTT 仓库的干扰较大。

新的方案采用了 rttpkgtool,这个工具和 cvitek_bootloader 类似,但是它采用了 prebuild 的固件,所以体积很小,而且不会引入源文件的污染。

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

[

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

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

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

  • BSP:
  • .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自查

Originally, for riscv big and little cores under bsp/cvitek,
after generating rtthread.bin, the cvitek_bootloader tool
would be used to package it and generate fip.bin and boot.sd
files that can be burned into sdcard. However, the
cvitek_bootloader tool repository is relatively large, and
it compiles and generates firmware such as fsbl, opensbi and
uboot from the source code level. And when using it, it
needs to be downloaded to the bsp/cvitek directory, which
will introduce pollution to source files in the RTT repository
under the original working path.

The new solution uses rttpkgtool, which is similar to
cvitek_bootloader, but it uses prebuilt firmware, so it is
very small and does not introduce pollution to the source file.

Signed-off-by: Chen Wang <[email protected]>
Based on the patch "bsp: cvitek: use rttpkgtool
to replace cvitek_bootloader", continue cleanup useless files.

Signed-off-by: Chen Wang <[email protected]>
@github-actions github-actions bot added BSP BSP: Cvitek BSP related with cvitek labels Jan 24, 2025
@Rbb666 Rbb666 merged commit c3e5152 into RT-Thread:master Jan 26, 2025
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BSP: Cvitek BSP related with cvitek BSP
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature] 优化 bsp/cvitek 固件打包的处理
2 participants