From 17380a68d5fade4aa4f07a0d26c2be68c167d26c Mon Sep 17 00:00:00 2001
From: Rose Thompson <ross1728@gmail.com>
Date: Mon, 5 Feb 2024 13:03:48 -0600
Subject: [PATCH] Moved buildroot testbench to the main testbench. However I
 don't have a positive control or negative indicator to say when the test
 completes or passes.

---
 sim/wally-batch.do     | 3 +--
 testbench/testbench.sv | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sim/wally-batch.do b/sim/wally-batch.do
index 127cb9ec7..1b157ffed 100644
--- a/sim/wally-batch.do
+++ b/sim/wally-batch.do
@@ -83,13 +83,12 @@ if {$2 eq "configOptions"} {
         vopt wkdir/work_${1}_${2}.testbench -work wkdir/work_${1}_${2} -G TEST=$2 -o testbenchopt +cover=sbecf
         vsim -lib wkdir/work_${1}_${2} testbenchopt  -fatal 7 -suppress 3829 -coverage
     } else {
-        vopt +acc wkdir/work_${1}_${2}.testbench -work wkdir/work_${1}_${2} -G TEST=$2 -o testbenchopt
+        vopt wkdir/work_${1}_${2}.testbench -work wkdir/work_${1}_${2} -G TEST=$2 -o testbenchopt
         vsim -lib wkdir/work_${1}_${2} testbenchopt  -fatal 7 -suppress 3829
     }
 #    vsim -lib wkdir/work_${1}_${2} testbenchopt  -fatal 7 -suppress 3829
     # power add generates the logging necessary for said generation.
     # power add -r /dut/core/*
-    do wave.do
     run -all
     # power off -r /dut/core/*
 } 
diff --git a/testbench/testbench.sv b/testbench/testbench.sv
index 04ec74407..feec06c01 100644
--- a/testbench/testbench.sv
+++ b/testbench/testbench.sv
@@ -384,10 +384,10 @@ module testbench;
       if (LoadMem) begin
         if (TEST == "buildroot") begin
           memFile = $fopen(bootmemfilename, "rb");
-          readResult = $fread(dut.uncore.uncore.ram.ram.memory.RAM, memFile);
+          readResult = $fread(dut.uncore.uncore.bootrom.bootrom.memory.ROM, memFile);
           $fclose(memFile);
           memFile = $fopen(memfilename, "rb");
-          readResult = $fread(dut.uncore.uncore.bootrom.bootrom.memory.ROM, memFile);
+          readResult = $fread(dut.uncore.uncore.ram.ram.memory.RAM, memFile);
           $fclose(memFile);
         end else 
           $readmemh(memfilename, dut.uncore.uncore.ram.ram.memory.RAM);