From ad5dd729283d8e221afcb5f56a27b7c5a9dae4fa Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 11 Oct 2024 11:05:45 +0200
Subject: [PATCH] Switch to debug2 instead of bench2

No need to run the SPEC benchmarks all the time. Stopping at the stage2
shell is enough to test most of the system.
---
 fpga/run-node.sh | 8 ++++----
 lagarto-ox.nix   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fpga/run-node.sh b/fpga/run-node.sh
index 13edf0c..c234acb 100755
--- a/fpga/run-node.sh
+++ b/fpga/run-node.sh
@@ -21,12 +21,12 @@ set -x
 ./fpgactl -w bitstream.bit -b opensbi.bin -k kernel.bin -i initrd.bin -r rootfs.img
 
 # Normal timeouts
-#timeout=$((30 * 60)) # Always stop after 30 min
-#timeout_silent=$((3 * 60)) # Stop if 3 min without output
+timeout=$((30 * 60)) # Always stop after 30 min
+timeout_silent=$((3 * 60)) # Stop if 3 min without output
 
 # Timeouts for SPEC benchmarks
-timeout=$((12 * 60 * 60)) # Always stop after 12 h
-timeout_silent=$((4 * 60 * 60)) # Stop if 4 h without output (some benchmarks take 1.6h)
+#timeout=$((12 * 60 * 60)) # Always stop after 12 h
+#timeout_silent=$((4 * 60 * 60)) # Stop if 4 h without output (some benchmarks take 1.6h)
 
 # Set dead switch
 sleep $timeout && killall picocom &
diff --git a/lagarto-ox.nix b/lagarto-ox.nix
index 015acf8..a90b0a0 100644
--- a/lagarto-ox.nix
+++ b/lagarto-ox.nix
@@ -540,7 +540,7 @@
     in prev.runCommand "uboot.txt" {} ''
       cat > $out <<EOF
       xtrace=yes
-      bootargs=root=/dev/ram0 loglevel=7 rw earlycon=sbi console=hvc0 bench2 init=${init}
+      bootargs=root=/dev/ram0 loglevel=7 rw earlycon=sbi console=hvc0 debug2 init=${init}
       ramdisk_size=$(stat --format %s $(readlink -f ${initrd}))
       bootcmd=fdt print; booti \''${kernel_addr_r} \''${ramdisk_addr_r}:\''${ramdisk_size} \''${fdtcontroladdr}
       EOF