1
0
Fork 0

didn't need u-boot

This commit is contained in:
Daniel Barlow 2023-09-19 21:09:01 +01:00
parent 56d679416f
commit c948a9b49a
3 changed files with 13 additions and 19 deletions

View File

@ -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; [
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
(mips-vm.override { inherit (pkgs) ubootQemuAarch64; })
];
};
}

View File

@ -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" ''

View File

@ -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 \