commit ec193c26f087c056ede94331e9bb7f28603e6866
author Sam Leffler <sleffler@google.com> Sat Oct 08 20:17:58 2022 +0000
committer Sam Leffler <sleffler@google.com> Sat Oct 08 20:17:58 2022 +0000
tree 13135d7292d46537d94463c6d42fb875d78de6e9
parent d935dd05da0cf959e9fd0140af913dc6fdaa0221
parent 21fd68c08a9d8c500e72e23043de15bf9523d85a

Merge remote-tracking branch 'refs/remotes/spacebeaker/master' into rebase

Change-Id: Id732a60fda8fbf7d81a5eaae197839d5ec020aba

src/env.c

diff --git a/src/env.c b/src/env.c
index 12d7b2c..e9dc80f 100644
--- a/src/env.c
+++ b/src/env.c
@@ -296,13 +296,7 @@
             break;
         }
         case AT_SEL4_BOOT_INFO: {
-            seL4_BootInfo *bootinfo = auxv[i].a_un.a_ptr;
-            if (bootinfo == SEL4RUNTIME_NULL) {
-                break;
-            }
-            env.bootinfo = bootinfo;
-            env.initial_thread_ipc_buffer = bootinfo->ipcBuffer;
-            env.initial_thread_tcb = seL4_CapInitThreadTCB;
+            env.bootinfo = auxv[i].a_un.a_ptr;
             break;
         }
         case AT_SEL4_IPC_BUFFER_PTR: {

src/start_root.c

diff --git a/src/start_root.c b/src/start_root.c
index 69383ad..f918a98 100644
--- a/src/start_root.c
+++ b/src/start_root.c
@@ -52,7 +52,7 @@
     struct {
         char const *const argv[2];
         char const *const envp[2];
-        auxv_t auxv[7];
+        auxv_t auxv[8];
     } info = {
         .argv = {
             "rootserver",
@@ -79,6 +79,9 @@
                 .a_type = AT_SEL4_BOOT_INFO,
                 .a_un.a_ptr = boot_info,
             }, {
+                .a_type = AT_SEL4_IPC_BUFFER_PTR,
+                .a_un.a_ptr = boot_info->ipcBuffer,
+            }, {
                 .a_type = AT_SEL4_TCB,
                 .a_un.a_val = seL4_CapInitThreadTCB,
             }, {