Skip to content

[libcpu][arm] 将 ARM 配置从公共 Kconfig 拆分至目录libcpu/arm - #11988

Merged
Rbb666 merged 1 commit into
RT-Thread:masterfrom
zijunteng238-dot:refactor-arm-kconfig
Nov 5, 2026
Merged

Rbb666 merged 1 commit into
RT-Thread:masterfrom
zijunteng238-dot:refactor-arm-kconfig

Conversation

@zijunteng238-dot

@zijunteng238-dot zijunteng238-dot commented Nov 5, 2026 •

Copy link
Copy Markdown
Contributor

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

[

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

关联 #9187。

libcpu/Kconfig 混合了 CPU 公共能力和多个架构的配置,不便于按架构维护。本 PR 先将 ARM 相关配置拆分至架构目录。

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

新增 libcpu/arm/Kconfig,将 ARM 架构标识、内核型号、ARM MMU/MPU、GIC 等相关配置搬入,并在 libcpu/Kconfig 中通过 rsource "arm/Kconfig" 引入。

公共能力和跨架构配置继续保留在原文件中,包括 KERNEL_VADDR_START。保留原有配置符号、默认值、依赖、select 关系和条件,不新增菜单,不调整其他架构配置。

新增说明文档 documentation/4.tool/scons/libcpu_kconfig_arm_split.md,记录拆分范围、依赖处理和验证结果。

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

  • BSP:
    • bsp/frdm-k64f(Cortex-M4)
    • bsp/qemu-vexpress-a9(Cortex-A9)
    • bsp/renesas/rzt2m_rsk(Cortex-R52)
    • bsp/qemu-virt64-aarch64(AArch64)
    • bsp/qemu-virt64-riscv(RISC-V 回归验证及 menuconfig 检查)
  • .config:
    本次拆分无需修改已有 .config。

使用 Kconfiglib 14.1.0,基于上述 BSP 已有配置,对比拆分前后的全部解析符号。配置值、类型、可见性、可赋值范围、默认值、依赖及选择关系均一致;排除文件路径和行号变化后,无新增解析警告。
额外在内存中为 Cortex-A9、AArch64 和 RISC-V 配置启用 CONFIG_RT_USING_SMART=y,并为 Cortex-A9 启用 CONFIG_RT_IOREMAP_LATE=y,对比结果一致。上述解析验证未写回配置文件。
在 bsp/qemu-virt64-riscv 目录下运行 scons --menuconfig,对比拆分前后的菜单输出,结果一致,确认该 BSP 的配置菜单未受影响。
]

当前拉取/合并请求的状态 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
  • 已经使用clang-format 源码格式化工具确保格式符合RT-Thread代码规范 This PR has been formatted with clang-format and complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@github-actions github-actions Bot added Doc This PR/issue related with documents libcpu labels Nov 5, 2026
@github-actions

github-actions Bot commented Nov 5, 2026

Copy link
Copy Markdown

👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).


🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • Use workflow from 保持默认分支(通常为 master)
    Keep the default branch (usually master) in Use workflow from
  • 在 branch 输入框填写 PR 分支 refactor-arm-kconfig
    Enter PR branch refactor-arm-kconfig in the branch field
  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将作为独立提交推送至你的分支。
    The formatting changes will be pushed to your branch as a separate commit.

完成后,提交将自动更新至 refactor-arm-kconfig 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the refactor-arm-kconfig branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们,再次感谢您的贡献!💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@github-actions

github-actions Bot commented Nov 5, 2026

Copy link
Copy Markdown

📌 Code Review Assignment

🏷️ Tag: documentation

Reviewers: @CXSforHPU @GorrayLi @lianux-mm

Changed Files (Click to expand)
  • documentation/4.tool/scons/libcpu_kconfig_arm_split.md

📊 Current Review Status (Last Updated: 2026-11-05 19:53 CST)


📝 Review Instructions

  1. 维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
    Maintainers can refresh the review status by clicking here: 🔄 Refresh Status

  2. 确认审核通过后评论 LGTM/lgtm
    Comment LGTM/lgtm after confirming approval

  3. PR合并前需至少一位维护者确认
    PR must be confirmed by at least one maintainer before merging

ℹ️ 刷新CI状态操作需要具备仓库写入权限。
ℹ️ Refresh CI status operation requires repository Write permission.

@Rbb666 Rbb666 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

复核提交 1a5f96d71eddcd585efa38b42f8e3ce9b04c18f1,本轮未发现配置拆分本身的阻断性问题。

使用 Kconfiglib 14.1.0,将 PR 基线与当前提交的 libcpu 配置分别代入本地 BSP 配置依赖树,对比了 frdm-k64f、qemu-vexpress-a9、rzt2m_rsk、qemu-virt64-aarch64、qemu-virt64-riscv,以及 A9/AArch64/RISC-V 的 Smart 变体,共 8 组配置。符号值、类型、可见性、可赋值范围、默认值、依赖和选择关系均一致。ARM 条目的迁移保留了条件,公共的 KERNEL_VADDR_START 也保留在原文件中。

尚有两项整理建议:

  • 当前提交信息 kconfig部分搬至arm/kconfig 缺少规定前缀,建议使用 [libcpu][arm] 将 ARM 配置拆分至架构目录,并保持 Kconfig 的实际大小写。
  • PR 描述仍勾选“草稿版本”,而 GitHub PR 状态不是草稿,请确认并统一实际就绪状态。

该提交目前的 CI 工作流处于 action_required,尚未执行,不能把当前没有失败的检查视为 CI 已通过。需完成 CI 核验后再合并。当前只有一个完整的功能提交,若检查通过且确认就绪,适合 rebase 合并,无需 squash。

@Rbb666
Rbb666 merged commit 89c70ab into RT-Thread:master Nov 5, 2026
53 of 54 checks passed
@github-actions

github-actions Bot commented Nov 5, 2026

Copy link
Copy Markdown

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Doc This PR/issue related with documents libcpu

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants