From f657caa176e58b677df1c81515111f75dff15102 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 12 May 2024 20:22:07 +0800 Subject: [PATCH] changes to atsama5d27 target for new kernel boot args @eupn this could use a review, I have no way to test this --- loader/src/platform/atsama5d27/asm.S | 2 +- loader/src/platform/atsama5d27/asm.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/src/platform/atsama5d27/asm.S b/loader/src/platform/atsama5d27/asm.S index f00230383..72b61c3ca 100644 --- a/loader/src/platform/atsama5d27/asm.S +++ b/loader/src/platform/atsama5d27/asm.S @@ -153,7 +153,7 @@ _prep_args: # Prepare arguments for the kernel `init` function (entrypoint) mov r0, r3 - pop {r2, r1} + pop {r3, r2, r1} # Restore kernel stack pointer from the r4 mov sp, r4 diff --git a/loader/src/platform/atsama5d27/asm.rs b/loader/src/platform/atsama5d27/asm.rs index 848d8d9e5..5049439cd 100644 --- a/loader/src/platform/atsama5d27/asm.rs +++ b/loader/src/platform/atsama5d27/asm.rs @@ -12,7 +12,7 @@ extern "C" { args: usize, // r3 ip: usize, rpt: usize, - debug: bool, - resume: bool, + xpt: usize, + debug_resume: usize, ) -> !; }