diff mbox series

[03/24] sandbox: Bring back setting mon_len in global_data

Message ID 20230115211602.1127661-4-sjg@chromium.org
State Accepted
Commit 2c88d5e110517ba7565b33eb8bfabb0ae0885eab
Delegated to: Tom Rini
Headers show
Series trace: Update the trace feature to work with trace-cmd | expand

Commit Message

Simon Glass Jan. 15, 2023, 9:15 p.m. UTC 
This change was made for the benefit of RISC-V but broke other
architectures also. In particular, tracing cannot work without this value.
Add it back for architectures which support it.

Fixes: 3c9fc23c443 ("sandbox: don't refer to symbol _init")
Signed-off-by: Simon Glass <sjg@chromium.org>
---

 common/board_f.c | 3 +++
 1 file changed, 3 insertions(+)
diff mbox series

Patch

diff --git a/common/board_f.c b/common/board_f.c
index 2b4edf30c93..f3c1ab53b1c 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -290,7 +290,10 @@  static int setup_mon_len(void)
 {
 #if defined(__ARM__) || defined(__MICROBLAZE__)
 	gd->mon_len = (ulong)&__bss_end - (ulong)_start;
+#elif defined(CONFIG_SANDBOX) && !defined(__riscv)
+	gd->mon_len = (ulong)&_end - (ulong)_init;
 #elif defined(CONFIG_SANDBOX)
+	/* gcc does not provide _init in crti.o on RISC-V */
 	gd->mon_len = 0;
 #elif defined(CONFIG_EFI_APP)
 	gd->mon_len = (ulong)&_end - (ulong)_init;