Repository navigation
[bsp][esp32] upgrade ESP-IDF to v6.1 with RT-Thread for C3/C6 | 升级 ESP-IDF 到 v6.1 并接入 RT-Thread(C3/C6) - #18
Merged
supperthomas merged 10000 commits intoOct 21, 2026
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
背景
接 #17 讨论:@supperthomas 希望把 IDF 升到 6.1,并说「提PR吧,没事的」——本 PR 直接对着当前
rtt-dev开(会带上整包 IDF 从约 5.1 → 6.1 的升级)。rtt-dev:rtt-dev...cms19859230182-lang:rtt-v6.1做了什么
rtt-dev原先约 5.1)。components/rtthread/(C3/C6 port、rtconfig.h、board/context、CMake/linker)components/riscv/vectors_rtthread.S,并在 FreeRTOS / esp_system / esp_timer 等处加CONFIG_IDF_RTOS_RTTHREAD开关路径Component config→FreeRTOS→Extra→Replace FreeRTOS with RT-Thread(CONFIG_IDF_RTOS_RTTHREAD)rtt-dev合入后,按 ESP-IDF v6.1 源码布局重写SConscript源码列表;补齐 C3 Wi-Fi/BLE 与 C6 源码列表;增加兼容层(port_compat、sdkconfig.hshim、arpa/inet.h、event_list等),使 BSP 侧 scons 能在 6.1 上编过。components/rtthread/README.md(需自备上游RT-Thread/rt-thread源码,设置RTTHREAD_ROOT)。配套 BSP / CI 改动(C3/C6 适配 + RISC-V 工具链升到 gcc 15.2)在主仓 #11870,不捆在本包内。FreeRTOS-Wrapper 兼容面见 #46,亦不捆入本 PR。
测试矩阵
说明:当前为单核;Wi-Fi / Bluetooth / light sleep 尚未完整支持(见组件 README)。
请审阅
请 @supperthomas 帮忙看一下:整包升到 6.1 是否按预期合入
rtt-dev,以及 C3/C6 的 RT-Thread 接入与 scons 源码列表是否合适。C6 上板验证若方便也拜托帮忙或指点一下。感谢!