From 661bcaa3ec2c73c570f941e60b4ca83f18d19f3a Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Fri, 2 Mar 2018 15:09:51 -0800 Subject: [PATCH] Change 'success' panic location to end of coldboot_main() --- exosphere/src/coldboot_main.c | 2 ++ exosphere/src/package2.c | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/exosphere/src/coldboot_main.c b/exosphere/src/coldboot_main.c index 2d5c1ae8c..d1951baff 100644 --- a/exosphere/src/coldboot_main.c +++ b/exosphere/src/coldboot_main.c @@ -24,5 +24,7 @@ void coldboot_main(void) { use_core_entrypoint_and_argument(get_core_id(), &ep, &arg); /* Nintendo jumps to EL1, we jump to EL2. Both are supported with all current packages2. */ + /* TODO: Remove this panic() when we're ready to test Kernel handoff. */ + panic(0x7A700001); __jump_to_lower_el(arg, ep, 2); } diff --git a/exosphere/src/package2.c b/exosphere/src/package2.c index 940f4f7ad..9ca9fbe1e 100644 --- a/exosphere/src/package2.c +++ b/exosphere/src/package2.c @@ -463,8 +463,4 @@ void load_package2(coldboot_crt0_reloc_list_t *reloc_list) { __asm__ __volatile__("isb"); } while(false); - - if (MAILBOX_NX_BOOTLOADER_IS_SECMON_AWAKE) { - panic(0x7A700001); - } }