Skip to content

system/nxinit: Revert "Give the builtin list to the kernel" - #3914

Merged
casaroli merged 1 commit into
apache:masterfrom
JianyuWang0623:mars538-revert-nxinit-builtins
Oct 25, 2026
Merged

casaroli merged 1 commit into
apache:masterfrom
JianyuWang0623:mars538-revert-nxinit-builtins

Conversation

@JianyuWang0623

Copy link
Copy Markdown
Contributor

Summary

Revert #3907. apache/nuttx#20964 removed BOARDIOC_BUILTINS; the protected kernel now reads the builtin list through struct userspace_s, so nxinit no longer needs to register it.

Impact

Fixes the protected-build break of system/nxinit (e.g. rv-virt:pnsh, esp32s3-devkit:knsh).

Testing

esp32s3-devkit:knsh with nuttx master 345643d5ae4:

Before:

init.c:214:29: error: storage size of 'builtin' isn't known
init.c:218:12: error: 'BOARDIOC_BUILTINS' undeclared (first use in this function)
make: *** [tools/LibTargets.mk:248: apps/libapps.a] Error 2

After: builds cleanly.

This reverts commit d9454d8.

apache/nuttx#20964 removed BOARDIOC_BUILTINS and struct boardioc_builtin_s,
so nxinit no longer builds in a protected build:

  init.c:214:29: error: storage size of 'builtin' isn't known
  init.c:218:12: error: 'BOARDIOC_BUILTINS' undeclared (first use in this function)

Assisted-by: Kiro:claude-opus-5.5
Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
@xiaoxiang781216
xiaoxiang781216 marked this pull request as ready for review October 25, 2026 12:46
@casaroli
casaroli merged commit 303c33d into apache:master Oct 25, 2026
49 of 77 checks passed
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.

4 participants