[BSP][K230] Add soft-fpu option for k230#10400
Merged
Rbb666 merged 3 commits intoRT-Thread:masterfrom Jun 30, 2025
Merged
Conversation
📌 Code Review Assignment🏷️ Tag: bsp_k230Path: Changed Files (Click to expand)
📊 Current Review Status (Last Updated: 2025-06-25 15:33 UTC)
📝 Review Instructions
|
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR adds support for a soft-FPU option for the k230 board by updating compiler flag settings in the SConstruct file and introducing new FPU configuration options in the Kconfig file.
- Updated the SConstruct to adjust compiler flags when the soft-FPU option is enabled.
- Modified the Kconfig to rename a board configuration and add a choice for FPU precision (software vs. double-precision).
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| bsp/k230/SConstruct | Added soft-FPU conditional logic that updates compile flags. |
| bsp/k230/Kconfig | Updated board configuration naming and introduced a new choice block for FPU options. |
Comments suppressed due to low confidence (1)
bsp/k230/Kconfig:42
- [nitpick] Consider adding inline comments in the choice block to explain the differences and implications of selecting the software FPU versus double-precision options, to help users make an informed decision.
choice BSP_RISCV_USING_FPU
Comment on lines
+41
to
+45
| rtconfig.DEVICE = rtconfig.DEVICE.replace('-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | ||
| rtconfig.CFLAGS = rtconfig.CFLAGS.replace('-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | ||
| rtconfig.LFLAGS = rtconfig.LFLAGS.replace('-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | ||
| rtconfig.AFLAGS = rtconfig.AFLAGS.replace('-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | ||
|
|
There was a problem hiding this comment.
The repeated use of replace() across multiple flags (DEVICE, CFLAGS, LFLAGS, AFLAGS) could be refactored into a helper function to improve maintainability and reduce duplication.
Suggested change
| rtconfig.DEVICE = rtconfig.DEVICE.replace('-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | |
| rtconfig.CFLAGS = rtconfig.CFLAGS.replace('-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | |
| rtconfig.LFLAGS = rtconfig.LFLAGS.replace('-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | |
| rtconfig.AFLAGS = rtconfig.AFLAGS.replace('-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | |
| def update_flag(flag_name, old_value, new_value): | |
| setattr(rtconfig, flag_name, getattr(rtconfig, flag_name).replace(old_value, new_value)) | |
| update_flag('DEVICE', '-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | |
| update_flag('CFLAGS', '-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | |
| update_flag('LFLAGS', '-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') | |
| update_flag('AFLAGS', '-march=rv64imafdcv -mabi=lp64d', '-march=rv64imafdc -mabi=lp64') |
Contributor
请问这个所谓兼容是指将工具链切换到 |
Contributor
|
我尝试应用该补丁后，menuconfig 换成 ”FPU precision (Software floating-point)“ ，工具链换成 ”riscv64-linux-musleabi_for_x86_64-pc-linux-gnu_latest“， 编译报错: scons: Reading SConscript files ...
scons: Entering directory `/home/u/ws/canaan/rt-thread/components/lwp/vdso/user/arch/risc-v'
scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
riscv64-linux-musleabi-gcc -o vdso_sys.os -c -mcmodel=medany -march=rv64imafdcv -mabi=lp64d -Wall -Wno-cpp -std=gnu99 -fdiagnostics-color=always -fPIC -O2 -I . -I /home/u/ws/canaan/rt-thread/components/lwp/vdso/user/arch/risc-v/../../.. -fPIC vdso_sys.c
riscv64-linux-musleabi-gcc -o /home/u/ws/canaan/rt-thread/components/lwp/vdso/user/build/libvdso.so -mcmodel=medany -march=rv64imafdcv -mabi=lp64d -Bsymbolic -Wl,--gc-sections -T /home/u/ws/canaan/rt-thread/components/lwp/vdso/user/arch/risc-v/vdso.lds -shared vdso_sys.os
/home/u/ws/test-rtt/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin/../lib/gcc/riscv64-linux-musleabi/12.2.0/../../../../riscv64-linux-musleabi/bin/ld: vdso_sys.os: can't link double-float modules with soft-float modules
/home/u/ws/test-rtt/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin/../lib/gcc/riscv64-linux-musleabi/12.2.0/../../../../riscv64-linux-musleabi/bin/ld: failed to merge target specific data of file vdso_sys.os
collect2: error: ld returned 1 exit status
scons: *** [/home/u/ws/canaan/rt-thread/components/lwp/vdso/user/build/libvdso.so] Error 1
scons: building terminated because of errors.
CalledProcessError: Command '['scons', '-C', '/home/u/ws/canaan/rt-thread/components/lwp/vdso/user/arch/risc-v']' returned non-zero exit status 2.:
File "/home/u/ws/canaan/rt-thread/bsp/k230/SConstruct", line 61:
objs = PrepareBuilding(env, RTT_ROOT, has_libcpu = False)
File "/home/u/ws/canaan/rt-thread/bsp/k230/../../tools/building.py", line 408:
objs.extend(SConscript(Rtt_Root + '/components/SConscript',
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 661:
return method(*args, **kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 598:
return _SConscript(self.fs, *files, **subst_kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 287:
exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals)
File "/home/u/ws/canaan/rt-thread/components/SConscript", line 15:
objs = objs + SConscript(os.path.join(item, 'SConscript'))
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 661:
return method(*args, **kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 598:
return _SConscript(self.fs, *files, **subst_kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 287:
exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals)
File "/home/u/ws/canaan/rt-thread/components/lwp/SConscript", line 57:
group = group + SConscript(os.path.join('vdso', 'SConscript'))
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 661:
return method(*args, **kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 598:
return _SConscript(self.fs, *files, **subst_kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 287:
exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals)
File "/home/u/ws/canaan/rt-thread/components/lwp/vdso/SConscript", line 41:
result = subprocess.run(command, env=process_env, check=True)
File "/usr/lib/python3.10/subprocess.py", line 526:
raise CalledProcessError(retcode, process.args,看上去编译选项并没有修改成功。简单跟踪了一下代码，感觉 |
Member
Author
唔，是vdso那边有些问题，会默认绑定rtconfig.py中的配置，而不认动态修改的。所以目前按soft-fpu方式使用，需要关闭vdso才行。 |
Contributor
你是准备继续修改这个问题，还是说打算让用户自己配置解决？ 如果是配置，是否可以在 enable soft-fpu 时联动解决，否则如果要用户自己手动配置，则还要改 readme |
Contributor
这个问题是否有回复？ |
Member
Author
是的，当使用soft-fpu时，就对应上面的这个工具链(riscv64-linux-musleabi-)。这个也是目前smart build中用的工具链。 |
Member
Author
这个暂时需要用户手动配置下。后续在vdso那边，想办法修复下。 |
Contributor
还有办法在 kconfig 中确保当我们选择 BSP_RISCV_FPU_D 时自动强制 disable RT_USING_VDSO？我没有找到好的办法。 如果没有办法确保配置自动 disable，请在这个 PR 中补充 README 文件说明需要人工操作。等后续 vdso 那边修复了再删除。 |
unicornx
suggested changes
Jun 18, 2025
Contributor
unicornx
left a comment
unicornx
left a comment
There was a problem hiding this comment.
见上面的评论，如果不能自动配置实现，需要更新 readme
Member
Author
ok，后续更新下README.md |
github-actions
bot
added
RT-Smart
Member
Author
后面的commit修正了这个问题，还麻烦重新验证下，谢谢。 |
Contributor
现在切换成 soft-fpu 是可以编译了，但是采用 double-fpu 又不行了。 riscv64-unknown-linux-musl-gcc -o vdso_sys.os -c -march=rv64imafdc -mabi=lp64 -Wall -Wno-cpp -std=gnu99 -fdiagnostics-color=always -fPIC -O2 -I . -I /home/u/ws/canaan/rt-thread/components/lwp/vdso/user/arch/risc-v/../../.. -fPIC vdso_sys.c
riscv64-unknown-linux-musl-gcc -o /home/u/ws/canaan/rt-thread/components/lwp/vdso/user/build/libvdso.so -march=rv64imafdc -mabi=lp64 -Bsymbolic -Wl,--gc-sections -T /home/u/ws/canaan/rt-thread/components/lwp/vdso/user/arch/risc-v/vdso.lds -shared vdso_sys.os
/home/u/ws/bin/rtt-canmv/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin/../lib/gcc/riscv64-unknown-linux-musl/13.2.0/../../../../riscv64-unknown-linux-musl/bin/ld: vdso_sys.os: can't link soft-float modules with double-float modules
/home/u/ws/bin/rtt-canmv/riscv64-linux-musleabi_for_x86_64-pc-linux-gnu/bin/../lib/gcc/riscv64-unknown-linux-musl/13.2.0/../../../../riscv64-unknown-linux-musl/bin/ld: failed to merge target specific data of file vdso_sys.os
collect2: error: ld returned 1 exit status
scons: *** [/home/u/ws/canaan/rt-thread/components/lwp/vdso/user/build/libvdso.so] Error 1
scons: building terminated because of errors.
CalledProcessError: Command '['scons', '-C', '/home/u/ws/canaan/rt-thread/components/lwp/vdso/user/arch/risc-v']' returned non-zero exit status 2.:
File "/home/u/ws/canaan/rt-thread/bsp/k230/SConstruct", line 60:
objs = PrepareBuilding(env, RTT_ROOT, has_libcpu = False)
File "/home/u/ws/canaan/rt-thread/bsp/k230/../../tools/building.py", line 408:
objs.extend(SConscript(Rtt_Root + '/components/SConscript',
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 661:
return method(*args, **kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 598:
return _SConscript(self.fs, *files, **subst_kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 287:
exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals)
File "/home/u/ws/canaan/rt-thread/components/SConscript", line 15:
objs = objs + SConscript(os.path.join(item, 'SConscript'))
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 661:
return method(*args, **kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 598:
return _SConscript(self.fs, *files, **subst_kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 287:
exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals)
File "/home/u/ws/canaan/rt-thread/components/lwp/SConscript", line 57:
group = group + SConscript(os.path.join('vdso', 'SConscript'))
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 661:
return method(*args, **kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 598:
return _SConscript(self.fs, *files, **subst_kw)
File "/usr/lib/python3/dist-packages/SCons/Script/SConscript.py", line 287:
exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals)
File "/home/u/ws/canaan/rt-thread/components/lwp/vdso/SConscript", line 41:
result = subprocess.run(command, env=process_env, check=True)
File "/usr/lib/python3.10/subprocess.py", line 526:
raise CalledProcessError(retcode, process.args, |
Member
Author
唔，测试不充分，ci也出错了。下一个时间点再修复下 |
unicornx
approved these changes
Jun 28, 2025
Contributor
unicornx
left a comment
unicornx
left a comment
There was a problem hiding this comment.
针对 double-float 和soft 均已测试过ok
Rbb666
approved these changes
Jun 30, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
拉取/合并请求描述：(PR description)
[
为什么提交这份PR (why to submit this PR)
当前内核是使用双精度浮点，V指令集扩展方式编译。加入Soft-FPU的选项，以兼容到类似qemu-riscv64的方式。
你的解决方案是什么 (what is your solution)
在Kconfig中加入对Soft-FPU的选项，同时在SConstruct文件中对Soft-FPU情况下，调整编译参数为
-march=rv64imafdc -mabi=lp64。请提供验证的bsp和config (provide the config and bsp)
]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality：
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up