From 14f6528318bdc7baf48305810546c752a7434273 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Mon, 1 Jul 2024 12:10:19 +0200
Subject: [PATCH] Use upstream u-boot and disable debug logs

---
 lagarto-ox.nix | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/lagarto-ox.nix b/lagarto-ox.nix
index 5350326..b160dda 100644
--- a/lagarto-ox.nix
+++ b/lagarto-ox.nix
@@ -119,11 +119,11 @@
 
     uboot = prev.ubootQemuRiscv64Smode.override {
       filesToInstall = [ "u-boot.bin" "u-boot-nodtb.bin" ];
-      version = "2023.07.02-print-cpu-probe";
-      src = builtins.fetchGit {
-        url = "file:///home/Computational/rarias/riscv/u-boot";
-        rev = "f80a22a480f0e4157647bacf90e663be457c72c4";
-      };
+      #version = "2023.07.02-print-cpu-probe";
+      #src = builtins.fetchGit {
+      #  url = "file:///home/Computational/rarias/riscv/u-boot";
+      #  rev = "f80a22a480f0e4157647bacf90e663be457c72c4";
+      #};
       #patches = [ ./u-boot-debug.patch ];
       #
       # CONFIG_SERIAL_PRESENT=n
@@ -149,13 +149,18 @@
         CONFIG_DEBUG_SBI_CONSOLE=y
         CONFIG_SMP=n
         CONFIG_TRACE_EARLY=y
-        CONFIG_LOG=y
-        CONFIG_LOGLEVEL=9
-        CONFIG_LOG_MAX_LEVEL=9
-        CONFIG_LOG_DEFAULT_LEVEL=9
-      '';
+      ''
+#      # Enable debug logs
+#      +
+#      ''
+#        CONFIG_LOG=y
+#        CONFIG_LOGLEVEL=9
+#        CONFIG_LOG_MAX_LEVEL=9
+#        CONFIG_LOG_DEFAULT_LEVEL=9
+#      ''
+      ;
       extraMakeFlags = [
-        "KCPPFLAGS=-DLOG_DEBUG"
+        #"KCPPFLAGS=-DLOG_DEBUG"
         #"EXT_DTB=${final.ox-dtb}"
       ];
     };