summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/riscv/trap_handler.c6
-rw-r--r--src/mainboard/emulation/qemu-power8/mainboard.c4
-rw-r--r--src/mainboard/emulation/qemu-riscv/mainboard.c3
-rw-r--r--src/mainboard/emulation/spike-riscv/mainboard.c3
4 files changed, 5 insertions, 11 deletions
diff --git a/src/arch/riscv/trap_handler.c b/src/arch/riscv/trap_handler.c
index 8120b66c06..f52ccf7e12 100644
--- a/src/arch/riscv/trap_handler.c
+++ b/src/arch/riscv/trap_handler.c
@@ -193,8 +193,7 @@ void handle_misaligned_load(trapframe *tf) {
tf->gpr[destRegister] = value;
} else {
// panic, this should not have happened
- printk(BIOS_DEBUG, "Code should not reach this path, misaligned on a non-64 bit store/load\n");
- while(1);
+ die("Code should not reach this path, misaligned on a non-64 bit store/load\n");
}
// return to where we came from
@@ -223,8 +222,7 @@ void handle_misaligned_store(trapframe *tf) {
}
} else {
// panic, this should not have happened
- printk(BIOS_DEBUG, "Code should not reach this path, misaligned on a non-64 bit store/load\n");
- while(1);
+ die("Code should not reach this path, misaligned on a non-64 bit store/load\n");
}
// return to where we came from
diff --git a/src/mainboard/emulation/qemu-power8/mainboard.c b/src/mainboard/emulation/qemu-power8/mainboard.c
index 102f54c2ee..6413f294e8 100644
--- a/src/mainboard/emulation/qemu-power8/mainboard.c
+++ b/src/mainboard/emulation/qemu-power8/mainboard.c
@@ -21,9 +21,7 @@ static void mainboard_enable(device_t dev)
{
if (!dev) {
- printk(BIOS_EMERG, "No dev0; die\n");
- while (1)
- ;
+ die("No dev0; die\n");
}
// Where does RAM live?
diff --git a/src/mainboard/emulation/qemu-riscv/mainboard.c b/src/mainboard/emulation/qemu-riscv/mainboard.c
index 111e9b185b..c53ca7b37c 100644
--- a/src/mainboard/emulation/qemu-riscv/mainboard.c
+++ b/src/mainboard/emulation/qemu-riscv/mainboard.c
@@ -21,8 +21,7 @@ static void mainboard_enable(device_t dev)
{
if (!dev) {
- printk(BIOS_EMERG, "No dev0; die\n");
- while (1);
+ die("No dev0; die\n");
}
ram_resource(dev, 0, 2048, 32768);
diff --git a/src/mainboard/emulation/spike-riscv/mainboard.c b/src/mainboard/emulation/spike-riscv/mainboard.c
index df2bdd68d6..eff95c0933 100644
--- a/src/mainboard/emulation/spike-riscv/mainboard.c
+++ b/src/mainboard/emulation/spike-riscv/mainboard.c
@@ -28,8 +28,7 @@ static void mainboard_enable(device_t dev)
const size_t ram_size = 1*GiB;
if (!dev) {
- printk(BIOS_EMERG, "No dev0; die\n");
- while (1);
+ die("No dev0; die\n");
}
ram_resource(dev, 0, 0x80000000/KiB, ram_size/KiB);