bootrom: also setup SBI a0+a1 for when we hang (chipsalliance#617)

This way a program started by the debugger still has the DTB handy.
WabashOS · Mar 27, 2017 · 722b0d5 · 722b0d5
1 parent 11507ac
commit 722b0d5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/bootrom/bootrom.S b/bootrom/bootrom.S
@@ -1,16 +1,21 @@
+#define DRAM_BASE 0x80000000
+
 .section .text.start, "ax", @progbits
 .globl _start
 _start:
-  la s0, DRAM_BASE
+  li s0, DRAM_BASE
   csrr a0, mhartid
   la a1, _dtb
   jr s0
 
 .section .text.hang, "ax", @progbits
 .globl _hang
 _hang:
+  csrr a0, mhartid
+  la a1, _dtb
+1:
   wfi
-  j _hang
+  j 1b
 
 .section .rodata.dtb, "a", @progbits
 .globl _dtb

diff --git a/bootrom/bootrom.img b/bootrom/bootrom.img
diff --git a/bootrom/linker.ld b/bootrom/linker.ld
@@ -1,7 +1,6 @@
 SECTIONS
 {
-    DRAM_BASE = 0x80000000;
-    ROM_BASE = 0x10000;
+    ROM_BASE = 0x10000; /* ... but actually position independent */
 
     . = ROM_BASE;
     .text.start : { *(.text.start) }