Updates to Freedom SoCs

[freedom-sifive.git] / bootrom / xip / xip.S

diff --git a/bootrom/xip/xip.S b/bootrom/xip/xip.S
index 329e1519f9e267ad28169e3e18c8ea625595198b..7445f4c93afd23c3c2fd09612593e6d5872e4f21 100644 (file)
--- a/bootrom/xip/xip.S
+++ b/bootrom/xip/xip.S
@@ -2,25 +2,15 @@
 // Execute in place
 // Jump directly to XIP_TARGET_ADDR
 
-  .text
+  .section .text.init
   .option norvc
   .globl _start
 _start:
-  j 1f
-  nop
-  nop
-#ifdef CONFIG_STRING
-  .word cfg_string
-#else
-  .word 0  // Filled in by GenerateBootROM in Chisel
-#endif
-
-1:
+  csrr a0, mhartid
+  la a1, dtb
   li t0, XIP_TARGET_ADDR
   jr t0
 
   .section .rodata
-#ifdef CONFIG_STRING
-cfg_string:
-  .incbin CONFIG_STRING
-#endif
+dtb:
+  .incbin DEVICE_TREE