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 { config = (pkgs.lib.evalModules {
modules = [ modules = [
@ -50,19 +49,16 @@ in {
# cross-compiling nix-shell for any package we're customizing # cross-compiling nix-shell for any package we're customizing
inherit pkgs; inherit pkgs;
buildEnv = buildEnv = pkgs.mkShell {
pkgs.mkShell { packages = with pkgs.pkgsBuildBuild; [
packages =
with pkgsNative; [
tufted tufted
routeros.routeros routeros.routeros
routeros.ros-exec-script routeros.ros-exec-script
mips-vm
borderVm.build.vm borderVm.build.vm
go-l2tp go-l2tp
min-copy-closure min-copy-closure
fennelrepl fennelrepl
(mips-vm.override { inherit (pkgs) ubootQemuAarch64; })
]; ];
}; };
} }

View File

@ -1,14 +1,12 @@
{ {
qemu qemu
, socat , socat
, ubootQemuAarch64
, writeShellScriptBin , writeShellScriptBin
, symlinkJoin , symlinkJoin
, lib , lib
}: let }: let
mips-vm = writeShellScriptBin "mips-vm" '' mips-vm = writeShellScriptBin "mips-vm" ''
export PATH="${lib.makeBinPath [qemu]}:$PATH" export PATH="${lib.makeBinPath [qemu]}:$PATH"
export UBOOT=${ubootQemuAarch64}/u-boot.bin
${builtins.readFile ./mips-vm.sh} ${builtins.readFile ./mips-vm.sh}
''; '';
connect = writeShellScriptBin "connect-vm" '' connect = writeShellScriptBin "connect-vm" ''

View File

@ -48,7 +48,7 @@ qemu-system-aarch64 \
-echr 16 \ -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" \ -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 \ -semihosting \
-cpu cortex-a72 -bios $UBOOT \ -cpu cortex-a72 \
-drive file=$rootfs,format=raw,readonly=off,if=virtio,index=0 \ -drive file=$rootfs,format=raw,readonly=off,if=virtio,index=0 \
${initramfs} \ ${initramfs} \
-netdev socket,id=access,mcast=230.0.0.1:1234,localaddr=127.0.0.1 \ -netdev socket,id=access,mcast=230.0.0.1:1234,localaddr=127.0.0.1 \