support aarch64 in tftpboot test

This commit is contained in:
Daniel Barlow
2023-12-19 12:12:12 +00:00
parent e5db2691e5
commit 32c13c46bb
7 changed files with 42 additions and 17 deletions

View File

@@ -4,8 +4,13 @@ let
dts = pkgs.runCommand "qemu.dts" {
nativeBuildInputs = with pkgs.pkgsBuildBuild; [ dtc qemu ];
} ''
qemu-system-arm -machine virt -machine dumpdtb=tmp.dtb
qemu-system-${pkgs.stdenv.hostPlatform.qemuArch} \
-machine virt -machine dumpdtb=tmp.dtb
dtc -I dtb -O dts -o $out tmp.dtb
# https://stackoverflow.com/a/69890137,
# XXX try fdtput $out -p -t s /pl061@9030000 status disabled
# instead of using sed
sed -i $out -e 's/compatible = "arm,pl061.*/status = "disabled";/g'
'';
in {
imports = [
@@ -15,7 +20,7 @@ in {
config = {
hardware.dts.src = lib.mkForce dts;
boot.tftp = {
loadAddress = lim.parseInt "0x42000000";
loadAddress = lim.parseInt "0x44000000";
serverip = "10.0.2.2";
ipaddr = "10.0.2.15";
};

View File

@@ -1,4 +1,4 @@
set timeout 10
set timeout 30
spawn socat unix-connect:vm/console -
expect "stop autoboot"

View File

@@ -1,13 +1,15 @@
{
liminix
}:
let check = deviceName : ubootName :
let derivation = (import liminix {
device = import "${liminix}/devices/qemu-armv7l/";
device = import "${liminix}/devices/${deviceName}/";
liminix-config = ./configuration.nix;
});
img = derivation.outputs.tftpboot;
pkgs = derivation.pkgs;
pkgsBuild = pkgs.pkgsBuildBuild;
uboot = derivation.pkgs.${ubootName};
pkgsBuild = derivation.pkgs.pkgsBuildBuild;
phram = 240 * 1024 * 1024;
in pkgsBuild.runCommand "check" {
nativeBuildInputs = with pkgsBuild; [
expect
@@ -17,15 +19,19 @@ in pkgsBuild.runCommand "check" {
} ''
mkdir vm
ln -s ${img} result
run-liminix-vm \
--background ./vm \
--u-boot ${pkgs.ubootQemuArm}/u-boot.bin \
--arch arm \
--flag -S \
--phram-address 0x40200000 \
--u-boot ${uboot}/u-boot.bin \
--arch ${derivation.pkgs.stdenv.hostPlatform.qemuArch} \
--phram-address $(printf "0x%x" ${toString phram} ) \
--lan "user,tftp=`pwd`" \
--disk-image result/rootfs \
result/uimage result/rootfs
expect ${./script.expect} 2>&1 |tee $out
''
'';
in {
arm = check "qemu-armv7l" "ubootQemuArm";
aarch64 = check "qemu-aarch64" "ubootQemuAarch64";
}