Skip to content
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

Remove build errors in bootloader #255

Merged
merged 2 commits into from
May 16, 2024
Merged

Remove build errors in bootloader #255

merged 2 commits into from
May 16, 2024

Conversation

jlaitine
Copy link

Summary

This for updating the nuttx in the saluki_bootloader_v2.

The tls warning removal is a direct cherry-pick from upstream.

Renaming the linker symbols is just a clean up; these same symbols are _ssbi_zerodev and _esbi_zerodev in the nuttx version in the bootloader currently.

Change the name to something that doesn't indicate where the sbi executable ram area is, it is anyhow determined in the linker script.

include/nuttx/tls.h:52:4: warning: #warning CONFIG_TLS_NELEM is not defined [-Wcpp]
   52 | #  warning CONFIG_TLS_NELEM is not defined
      |    ^~~~~~~
In file included from include/nuttx/sched.h:48,
                 from include/nuttx/arch.h:87,
                 from include/nuttx/userspace.h:35,
                 from include/nuttx/mm/mm.h:30,
                 from include/nuttx/kmalloc.h:34,
                 from sim_bringup.c:33:
include/nuttx/tls.h:52:4: warning: #warning CONFIG_TLS_NELEM is not defined [-Wcpp]
   52 | #  warning CONFIG_TLS_NELEM is not defined
      |    ^~~~~~~

Signed-off-by: chao an <[email protected]>
@jlaitine jlaitine requested a review from pussuw May 16, 2024 10:44
…_ram and _esbi_ram

The original names are confusing; the symbols' addresses point to the start and end of the
sbi executable ram area. This may also reside in l2lim and not in ddr, depending on the
configuration, and this is defined in the linker script.

Signed-off-by: Jukka Laitinen <[email protected]>
@jlaitine jlaitine force-pushed the remove_build_errors branch from ea6a031 to 34af573 Compare May 16, 2024 11:27
@jlaitine
Copy link
Author

Now tested the change. I had forgotten the mpfs_opensbi_utils.S . Changed that as well

@jlaitine jlaitine merged commit 1079abf into master May 16, 2024
11 checks passed
@jlaitine jlaitine deleted the remove_build_errors branch May 16, 2024 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants