From 8a123d93bf4ec3b6009e550122286dbfba328970 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 30 Aug 2024 11:54:45 +0200
Subject: [PATCH] Place environment in U-Boot

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

diff --git a/lagarto-ox.nix b/lagarto-ox.nix
index d5c6400..e367f8d 100644
--- a/lagarto-ox.nix
+++ b/lagarto-ox.nix
@@ -221,6 +221,15 @@
         ./uboot-debug-ext-interrupts.patch
         ./uboot-exception-extras.patch
       ];
+      # Copy our environment to board/emulation/qemu-riscv/environ.env
+      preConfigure = ''
+        cp ${final.uboot-env} board/emulation/qemu-riscv/environ.env
+      '';
+      postConfigure = ''
+        echo --------------------------- generated config:
+        cat .config
+        echo ---------------------------
+      '';
       #
       # CONFIG_SERIAL_PRESENT=n
       # CONFIG_SYS_NS16550=n
@@ -248,6 +257,7 @@
         CONFIG_CMD_MEMTEST=y
         CONFIG_CMD_EXCEPTION=y
         CONFIG_CMD_TIMER=y
+        CONFIG_ENV_SOURCE_FILE="environ"
       ''
 #      # Enable debug logs
 #      +
@@ -259,6 +269,7 @@
 #      ''
       ;
       extraMakeFlags = [
+        "V=1"
         #"KCPPFLAGS=-DLOG_DEBUG"
         #"EXT_DTB=${final.ox-dtb}"
       ];