From: Richard W.M. Jones <rjones@redhat.com>
Date: Sat, 6 Aug 2016 07:57:43 +0000 (+0100)
Subject: Add 'boot-stage3-in-spike' and 'boot-stage3-in-qemu' targets.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=5ca5526f6369c9386996383982f608242e89a342;p=fedora-riscv.git

Add 'boot-stage3-in-spike' and 'boot-stage3-in-qemu' targets.

These helpers boot the stage3 disk image in Spike or QEMU
respectively.
---

diff --git a/Makefile b/Makefile
index 2cc075c..08c4e1b 100644
--- a/Makefile
+++ b/Makefile
@@ -317,6 +317,17 @@ stage3-chroot/init: init.sh
 stage3-disk.img: stage3-chroot
 	cd stage3-chroot && virt-make-fs . ../$@ -t ext2 -F raw -s +4G
 
+# 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 \
+	    /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
+
 # Stage 4
 
 stage4:
diff --git a/README b/README
index 97e5db4..f4f03ef 100644
--- a/README
+++ b/README
@@ -5,16 +5,6 @@ by Richard W.M. Jones (rjones@redhat.com)
 Project home page: https://fedoraproject.org/wiki/Architectures/RISC-V
 
 
-Current status
---------------
-
-Stuck getting QEMU to work.  See:
-https://groups.google.com/a/groups.riscv.org/forum/#!topic/sw-dev/fdbhLufxezA
-
-Will likely wait until September when we may see a working QEMU that
-is compatible with the latest RISC-V software.
-
-
 The aim of the project
 ----------------------