From c948a9b49a67e2f579d17657d2091a460aad3c3e Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Tue, 19 Sep 2023 21:09:01 +0100
Subject: [PATCH] didn't need u-boot

---
 default.nix              | 28 ++++++++++++----------------
 pkgs/mips-vm/default.nix |  2 --
 pkgs/mips-vm/mips-vm.sh  |  2 +-
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/default.nix b/default.nix
index 46692fa..5f23d16 100644
--- a/default.nix
+++ b/default.nix
@@ -16,7 +16,6 @@ let
       ];
     };
   });
-  pkgsNative = pkgs.pkgsBuildBuild;
 
   config = (pkgs.lib.evalModules {
     modules = [
@@ -50,19 +49,16 @@ in {
   # cross-compiling nix-shell for any package we're customizing
   inherit pkgs;
 
-  buildEnv =
-    pkgs.mkShell {
-      packages =
-        with pkgsNative; [
-        tufted
-        routeros.routeros
-        routeros.ros-exec-script
-        borderVm.build.vm
-        go-l2tp
-        min-copy-closure
-        fennelrepl
-        (mips-vm.override { inherit (pkgs) ubootQemuAarch64; })
-      ];
-
-    };
+  buildEnv = pkgs.mkShell {
+    packages = with pkgs.pkgsBuildBuild; [
+      tufted
+      routeros.routeros
+      routeros.ros-exec-script
+      mips-vm
+      borderVm.build.vm
+      go-l2tp
+      min-copy-closure
+      fennelrepl
+    ];
+  };
 }
diff --git a/pkgs/mips-vm/default.nix b/pkgs/mips-vm/default.nix
index bd9dc46..21d268c 100644
--- a/pkgs/mips-vm/default.nix
+++ b/pkgs/mips-vm/default.nix
@@ -1,14 +1,12 @@
 {
   qemu
 , socat
-, ubootQemuAarch64
 , writeShellScriptBin
 , symlinkJoin
 , lib
 }: let
   mips-vm = writeShellScriptBin "mips-vm" ''
      export PATH="${lib.makeBinPath [qemu]}:$PATH"
-     export UBOOT=${ubootQemuAarch64}/u-boot.bin
      ${builtins.readFile ./mips-vm.sh}
   '';
   connect = writeShellScriptBin "connect-vm" ''
diff --git a/pkgs/mips-vm/mips-vm.sh b/pkgs/mips-vm/mips-vm.sh
index 056c792..b07d707 100755
--- a/pkgs/mips-vm/mips-vm.sh
+++ b/pkgs/mips-vm/mips-vm.sh
@@ -48,7 +48,7 @@ qemu-system-aarch64 \
     -echr 16 \
     -append "liminix default earlycon=smh console=ttyAMA0,38400n8 panic=10 oops=panic init=$INIT loglevel=8 root=/dev/mtdblock0 block2mtd.block2mtd=/dev/vda,65536" \
     -semihosting \
-    -cpu cortex-a72 -bios $UBOOT \
+    -cpu cortex-a72 \
     -drive file=$rootfs,format=raw,readonly=off,if=virtio,index=0 \
     ${initramfs} \
     -netdev socket,id=access,mcast=230.0.0.1:1234,localaddr=127.0.0.1 \