stage 3: Allow DISK=... parameter to boot-stage3-in-qemu/-in-spike.
authorRichard W.M. Jones <rjones@redhat.com>
Fri, 12 Aug 2016 17:15:10 +0000 (18:15 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Fri, 12 Aug 2016 17:15:10 +0000 (18:15 +0100)
This allows us to run multiple parallel builds using different
disks.

Makefile

index 9a4eefd..ece2886 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1037,16 +1037,18 @@ stage3-disk.img.xz: stage3-disk.img
        rm -f $@
        xz --best $^
 
+DISK := stage3-disk.img
+
 # Helper which boots stage3 disk image in spike.
 boot-stage3-in-spike: stage3-disk.img stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux
-       spike +disk=stage3-disk.img \
+       spike +disk=$(DISK) \
            /usr/bin/bbl stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux
 
 # Helper which boots stage3 disk image in qemu.
 boot-stage3-in-qemu: stage3-disk.img stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux
        qemu-system-riscv -kernel /usr/bin/bbl \
            -append ./stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \
-           -drive file=stage3-disk.img,format=raw -nographic
+           -drive file=$(DISK),format=raw -nographic
 
 # Stage 4