From 23b2ac2013a141dfcb6d02bbc34cc1a08f994eec Mon Sep 17 00:00:00 2001
From: Gabriel Somlo <gsomlo@gmail.com>
Date: Wed, 22 Sep 2021 09:46:39 -0400
Subject: [PATCH] cpu/vexriscv_smp/crt0.S: only boot core should run data_init

Also, no need for non-boot cores to `call smp_slave`, it's the
immediately following instruction for them already.
---
 litex/soc/cores/cpu/vexriscv_smp/crt0.S | 29 ++++++++++++-------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/litex/soc/cores/cpu/vexriscv_smp/crt0.S b/litex/soc/cores/cpu/vexriscv_smp/crt0.S
index 95bc0949a..ec18b8ecd 100644
--- a/litex/soc/cores/cpu/vexriscv_smp/crt0.S
+++ b/litex/soc/cores/cpu/vexriscv_smp/crt0.S
@@ -63,23 +63,9 @@ crt_init:
   csrw mtvec, a0
   sw x0, smp_lottery_lock, a1
 
-data_init:
-  la a0, _fdata
-  la a1, _edata
-  la a2, _fdata_rom
-data_loop:
-  beq a0,a1,data_done
-  lw a3,0(a2)
-  sw a3,0(a0)
-  add a0,a0,4
-  add a2,a2,4
-  j data_loop
-data_done:
-
 smp_tyranny:
   csrr a0, mhartid
-  beqz a0, bss_init
-  call smp_slave
+  beqz a0, data_init
 
 smp_slave:
   lw a0, smp_lottery_lock
@@ -93,6 +79,19 @@ smp_slave:
   lw x13, smp_lottery_target
   jr x13
 
+data_init:
+  la a0, _fdata
+  la a1, _edata
+  la a2, _fdata_rom
+data_loop:
+  beq a0,a1,data_done
+  lw a3,0(a2)
+  sw a3,0(a0)
+  add a0,a0,4
+  add a2,a2,4
+  j data_loop
+data_done:
+
 bss_init:
   la a0, _fbss
   la a1, _ebss