From 60f96112db2707ba676a17321118afaeda0301a7 Mon Sep 17 00:00:00 2001
From: Rose Thompson <ross1728@gmail.com>
Date: Fri, 1 Mar 2024 10:23:55 -0600
Subject: [PATCH] Moved the zero stage boot loader to the fpga directory.

---
 {tests/custom => fpga}/zsbl/Makefile    | 2 +-
 {tests/custom => fpga}/zsbl/bios.s      | 2 +-
 {tests/custom => fpga}/zsbl/copyFlash.c | 0
 {tests/custom => fpga}/zsbl/gpt.c       | 0
 {tests/custom => fpga}/zsbl/gpt.h       | 0
 {tests/custom => fpga}/zsbl/main.c      | 0
 {tests/custom => fpga}/zsbl/sdcDriver.c | 2 +-
 {tests/custom => fpga}/zsbl/sdcDriver.h | 0
 {tests/custom => fpga}/zsbl/smp.h       | 0
 {tests/custom => fpga}/zsbl/uart.c      | 0
 {tests/custom => fpga}/zsbl/uart.h      | 0
 11 files changed, 3 insertions(+), 3 deletions(-)
 rename {tests/custom => fpga}/zsbl/Makefile (98%)
 rename {tests/custom => fpga}/zsbl/bios.s (97%)
 rename {tests/custom => fpga}/zsbl/copyFlash.c (100%)
 rename {tests/custom => fpga}/zsbl/gpt.c (100%)
 rename {tests/custom => fpga}/zsbl/gpt.h (100%)
 rename {tests/custom => fpga}/zsbl/main.c (100%)
 rename {tests/custom => fpga}/zsbl/sdcDriver.c (98%)
 rename {tests/custom => fpga}/zsbl/sdcDriver.h (100%)
 rename {tests/custom => fpga}/zsbl/smp.h (100%)
 rename {tests/custom => fpga}/zsbl/uart.c (100%)
 rename {tests/custom => fpga}/zsbl/uart.h (100%)

diff --git a/tests/custom/zsbl/Makefile b/fpga/zsbl/Makefile
similarity index 98%
rename from tests/custom/zsbl/Makefile
rename to fpga/zsbl/Makefile
index 6dec9c797..bd30033fc 100644
--- a/tests/custom/zsbl/Makefile
+++ b/fpga/zsbl/Makefile
@@ -21,7 +21,7 @@ ROOT		:= ..
 LIBRARY_DIRS	:= 
 LIBRARY_FILES	:=
 
-MARCH           :=-march=rv64imfdc
+MARCH           :=-march=rv64imfdc_zifencei
 MABI            :=-mabi=lp64d
 LINK_FLAGS      :=$(MARCH) $(MABI) -nostartfiles
 LINKER		:=linker.x
diff --git a/tests/custom/zsbl/bios.s b/fpga/zsbl/bios.s
similarity index 97%
rename from tests/custom/zsbl/bios.s
rename to fpga/zsbl/bios.s
index ebeadcf59..7954eab7a 100644
--- a/tests/custom/zsbl/bios.s
+++ b/fpga/zsbl/bios.s
@@ -94,5 +94,5 @@ end_of_bios:
 .globl _dtb
 .align 4, 0
 _dtb:
-.incbin "wally-vcu118.dtb"
+#.incbin "wally-vcu118.dtb"
 
diff --git a/tests/custom/zsbl/copyFlash.c b/fpga/zsbl/copyFlash.c
similarity index 100%
rename from tests/custom/zsbl/copyFlash.c
rename to fpga/zsbl/copyFlash.c
diff --git a/tests/custom/zsbl/gpt.c b/fpga/zsbl/gpt.c
similarity index 100%
rename from tests/custom/zsbl/gpt.c
rename to fpga/zsbl/gpt.c
diff --git a/tests/custom/zsbl/gpt.h b/fpga/zsbl/gpt.h
similarity index 100%
rename from tests/custom/zsbl/gpt.h
rename to fpga/zsbl/gpt.h
diff --git a/tests/custom/zsbl/main.c b/fpga/zsbl/main.c
similarity index 100%
rename from tests/custom/zsbl/main.c
rename to fpga/zsbl/main.c
diff --git a/tests/custom/zsbl/sdcDriver.c b/fpga/zsbl/sdcDriver.c
similarity index 98%
rename from tests/custom/zsbl/sdcDriver.c
rename to fpga/zsbl/sdcDriver.c
index edbe0677d..45caa42fa 100644
--- a/tests/custom/zsbl/sdcDriver.c
+++ b/fpga/zsbl/sdcDriver.c
@@ -1,7 +1,7 @@
 ///////////////////////////////////////////
 // SDC.sv
 //
-// Written: Ross Thompson September 25, 2021
+// Written: Rose Thompson September 25, 2021
 // Modified: 
 //
 // Purpose: driver for sdc reader.
diff --git a/tests/custom/zsbl/sdcDriver.h b/fpga/zsbl/sdcDriver.h
similarity index 100%
rename from tests/custom/zsbl/sdcDriver.h
rename to fpga/zsbl/sdcDriver.h
diff --git a/tests/custom/zsbl/smp.h b/fpga/zsbl/smp.h
similarity index 100%
rename from tests/custom/zsbl/smp.h
rename to fpga/zsbl/smp.h
diff --git a/tests/custom/zsbl/uart.c b/fpga/zsbl/uart.c
similarity index 100%
rename from tests/custom/zsbl/uart.c
rename to fpga/zsbl/uart.c
diff --git a/tests/custom/zsbl/uart.h b/fpga/zsbl/uart.h
similarity index 100%
rename from tests/custom/zsbl/uart.h
rename to fpga/zsbl/uart.h