summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--lib/cxx-abi.hpp2
-rw-r--r--src/neboot-start.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/cxx-abi.hpp b/lib/cxx-abi.hpp
index 56c47af..223f773 100644
--- a/lib/cxx-abi.hpp
+++ b/lib/cxx-abi.hpp
@@ -7,6 +7,8 @@
#pragma once
+#include <lib/boot.h>
+
#define DSO_MAX_OBJECTS (128)
struct atexit_func_entry_t final {
diff --git a/src/neboot-start.c b/src/neboot-start.c
index f54ad1f..c282f55 100644
--- a/src/neboot-start.c
+++ b/src/neboot-start.c
@@ -106,6 +106,7 @@ void cb_start_exec(void) {
if (boot_hdr->h_start_address != 0) {
cb_boot_processor_ready = 1;
cb_start_context(boot_hdr->h_start_address);
+ cb_boot_processor_ready = 0;
}
cb_put_string("NB> StageTwo has returned? (CB0002)\r\n");
@@ -131,6 +132,7 @@ void cb_start_exec(void) {
cb_boot_processor_ready = 1;
cb_start_context((uintptr_t) (voidptr_t) blk + start_lba);
+ cb_boot_processor_ready = 0;
if (hart == 1) {
cb_put_string("NB> Can't boot to StageTwo. (CB0001)\r\n");