Skip to content

[bsp/phytium]适配rtthread5.2版本 #10178

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

Merged
merged 9 commits into from
Apr 14, 2025
Merged

Conversation

messigogogo
Copy link
Contributor

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

[

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

适配phytium芯片rtthread5.2版本,增加新驱动与模块。对原先驱动进行调整

你的解决方案是什么 (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自查

rtthread 5.2适配

See merge request zhangyan1491/rt-thread!7
@supperthomas supperthomas requested a review from Copilot April 10, 2025 11:31
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot reviewed 54 out of 65 changed files in this pull request and generated no comments.

Files not reviewed (11)
  • bsp/phytium/aarch32/.config: Language not supported
  • bsp/phytium/aarch32/configs/e2000d_demo_rtsmart: Language not supported
  • bsp/phytium/aarch32/configs/e2000d_demo_rtthread: Language not supported
  • bsp/phytium/aarch32/configs/e2000d_demo_rtthread_pusb2_dc: Language not supported
  • bsp/phytium/aarch32/configs/e2000q_demo_rtsmart: Language not supported
  • bsp/phytium/aarch32/configs/e2000q_demo_rtthread: Language not supported
  • bsp/phytium/aarch32/configs/phytium_pi_rtsmart: Language not supported
  • bsp/phytium/aarch32/configs/phytium_pi_rtthread: Language not supported
  • bsp/phytium/aarch32/configs/phytium_pi_rtthread_pusb2_hc: Language not supported
  • bsp/phytium/aarch32/makefile: Language not supported
  • bsp/phytium/aarch64/.config: Language not supported
Comments suppressed due to low confidence (2)

bsp/phytium/aarch32/rtconfig.h:71

  • The macro RT_USING_OVERFLOW_CHECK is defined in one section but appears to be removed in another diff hunk. Please ensure that its definition is applied consistently across the file to avoid potential configuration conflicts.
#define RT_USING_OVERFLOW_CHECK

bsp/phytium/aarch32/configs/phytium_pi_rtthread_pusb2_hc.h:345

  • A duplicate definition of RT_PAGE_MAX_ORDER is present in different memory management sections. Consider consolidating this definition to prevent potential conflicts and improve maintainability.
#define RT_PAGE_MAX_ORDER 11

@supperthomas
Copy link
Member

请加一下ci

@supperthomas
Copy link
Member

@BernardXiong
Copy link
Member

😢 是否可以不是刷config的模式?应该有更好的办法吧

@github-actions github-actions bot added the action github action yml imporve label Apr 11, 2025
@messigogogo
Copy link
Contributor Author

Member
已添加

@supperthomas
Copy link
Member

supperthomas commented Apr 11, 2025

@sakumisu

cherryusb请帮忙review一下

@sakumisu
Copy link
Contributor

cherryusb 部分没问题

{
"RTT_BSP": "phytium_aarch64",
"RTT_TOOL_CHAIN": "sourcery-aarch64",
"SUB_RTT_BSP": [
Copy link
Member

Choose a reason for hiding this comment

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

请合并到上面的aarch64组中:"RTT_BSP": "aarch64",

},
{
"RTT_BSP": "phytium_aarch32",
"RTT_TOOL_CHAIN": "sourcery-arm",
Copy link
Member

Choose a reason for hiding this comment

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

放到该组中:"RTT_BSP": "others_ft32_mm32_acm32",

@@ -3,13 +3,72 @@

/* RT-Thread Kernel */

/* klibc options */

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

@messigogogo messigogogo Apr 11, 2025

Choose a reason for hiding this comment

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

您好,我目前的方案是在一个架构下支持多套Kconfig,比如在aarch64/configs目录下,包含了多个CPU的支持,使用时会拉取一套配置至aarch64/.config&rtconfig.h。这种结构可以适配您说的方案吗?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

@supperthomas supperthomas Apr 11, 2025

Choose a reason for hiding this comment

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

您好,我目前的方案是在一个架构下支持多套Kconfig,比如在aarch64/configs目录下,包含了多个CPU的支持,使用时会拉取一套配置至aarch64/.config&rtconfig.h。这种结构可以适配您说的方案吗?

支持的,你可以直接使用scons --attach=e2000d_demo_rtsmart 你可以先加几个配置试试看。
比如先把.config和rtconfig.h 替换成你想要个的配置,然后执行menuconfig,然后按键盘d,然后把配置保存到yml中,试试。
参考链接:
https://club.rt-thread.org/ask/article/d273bbcd1f8779bc.html

Copy link
Contributor Author

@messigogogo messigogogo Apr 14, 2025

Choose a reason for hiding this comment

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

你好,scons --attach=?我测试了没有问题,但另一个文档中bsp_buildings.yml,似乎没有其他开发板信息,是加在其他地方了吗?@supperthomas

Copy link
Member

@supperthomas supperthomas Apr 14, 2025

Choose a reason for hiding this comment

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

感谢PR,
这个bsp_buildings.yml优化到:
https://github.com/RT-Thread/rt-thread/blob/master/.github/ALL_BSP_COMPILE.json
里面了,直接在json里面修改即可,我看你们有提PR,参考comment修改即可。

@supperthomas
Copy link
Member

image

@supperthomas
Copy link
Member

这边建议config的,先恢复,暂时不改,只修改json,让CI编译基本的,然后再起一个PR,单独处理config到yml中。另外那个PR会检查所有的config的编译情况,根据在ubuntu上执行scons. 另外一个PR会单独编译对应的bsp。

@messigogogo
Copy link
Contributor Author

这边建议config的,先恢复,暂时不改,只修改json,让CI编译基本的,然后再起一个PR,单独处理config到yml中。另外那个PR会检查所有的config的编译情况,根据在ubuntu上执行scons. 另外一个PR会单独编译对应的bsp。

我回退了,先合入这个,然后我再提一个

Copy link
Member

Choose a reason for hiding this comment

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

这个文件需要吗?不需要的话,可以删掉

@supperthomas
Copy link
Member

@messigogogo 这个PR先合并了,后续尽快提交yml修复ci中的编译问题。

@supperthomas supperthomas merged commit 3ebad06 into RT-Thread:master Apr 14, 2025
56 checks passed
Lin-Chengqiu pushed a commit to Lin-Chengqiu/rt-thread that referenced this pull request Apr 14, 2025
add RT_THREAD_CTRL_SET_PRIORITY

add RT_THREAD_CTRL_SET_PRIORITY

doxygen: cleanup and re-org files

This patch contains two small changes, mainly to
prepare for the next step of organizing the modules
framework.

The first change: move the files related to doxygen
examples to `documentation/0.doxygen/example/`

The second change: delete `documentation/0.doxygen/mainpage.h`,
which is the mainpage of the old page. Now the new mainpage
is `documentation/INDEX.md`, so the duplicate can be
deleted.

Signed-off-by: Chen Wang <[email protected]>

[bsp/hpm5300evk]: 修复readme中的描述问题 (RT-Thread#10187)

1.bsp中描述路径boards不存在,只有board,并且路径中会包含openocd,把openocd路径去掉
2. 运行openocd发现cmsis-dap.cfg异常,使用ft2232.cfg可以正常烧入,修改readme
3. 添加download.bat脚本,方便下载

libcpu: aarch64: Fix NORMAL_NOCACHE_MEM attr (RT-Thread#10180)

Signed-off-by: Cliff Chen <[email protected]>
Signed-off-by: mouch6131 <[email protected]>
Co-authored-by: Cliff Chen <[email protected]>

Fixed an error by running scons --tartget=cmake under LINUX, RT-Thread#10113 (RT-Thread#10164)

Fixed an error by running scons --tartget=cmake under LINUX, and associated issue RT-Thread#10113

[DM/FDT] Fix garble when booting

Fix garble caused by empty implementation of earlycon series
function in driver.If driver doesn't offer earlycon_id or rt_f
dt_earlycon_id.setup function but open option, the checking
of best_earlycon_id will failed.

Signed-off-by: 1078249029 <[email protected]>

[bsp/phytium]适配rtthread5.2版本 (RT-Thread#10178)

* rtthread 5.2适配
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants