From 8e8ce09ce92e239920732ee2352ef24f43074436 Mon Sep 17 00:00:00 2001
From: Nathan Pemberton <nathanp@berkeley.edu>
Date: Fri, 4 Oct 2019 19:04:08 -0400
Subject: [PATCH] Move qemu to chipyard from firesim

---
 .gitmodules                               | 3 +++
 scripts/build-toolchains.sh               | 3 +++
 scripts/init-submodules-no-riscv-tools.sh | 2 ++
 sims/firesim                              | 2 +-
 toolchains/qemu                           | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)
 create mode 160000 toolchains/qemu

diff --git a/.gitmodules b/.gitmodules
index 4c23765e..2f4d9eb3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -92,3 +92,6 @@
 [submodule "vlsi/hammer-mentor-plugins"]
 	path = vlsi/hammer-mentor-plugins
 	url = git@github.com:ucb-bar/hammer-mentor-plugins.git
+[submodule "toolchains/qemu"]
+	path = toolchains/qemu
+	url = https://github.com/qemu/qemu.git
diff --git a/scripts/build-toolchains.sh b/scripts/build-toolchains.sh
index 738b5ae7..cde56227 100755
--- a/scripts/build-toolchains.sh
+++ b/scripts/build-toolchains.sh
@@ -121,6 +121,9 @@ cp -p "${SRCDIR}/riscv-isa-sim/build/libfesvr.a" "${RISCV}/lib/"
 CC= CXX= module_all riscv-pk --prefix="${RISCV}" --host=riscv64-unknown-elf
 module_all riscv-tests --prefix="${RISCV}/riscv64-unknown-elf"
 
+# Common tools (not in any particular toolchain dir)
+SRCDIR="$RDIR/toolchains" module_all qemu --prefix="${RISCV}" --target-list=riscv64-softmmu
+
 cd "$RDIR"
 
 {
diff --git a/scripts/init-submodules-no-riscv-tools.sh b/scripts/init-submodules-no-riscv-tools.sh
index 34b9ed8d..8f90f2d1 100755
--- a/scripts/init-submodules-no-riscv-tools.sh
+++ b/scripts/init-submodules-no-riscv-tools.sh
@@ -30,6 +30,8 @@ cd "$RDIR"
 for name in toolchains/*/*/ ; do
     git config submodule."${name%/}".update none
 done
+git config submodule.toolchains.qemu.update none
+
 # Disable updates to the FireSim submodule until explicitly requested
 git config submodule.sims/firesim.update none
 # Disable updates to the hammer tool plugins repos
diff --git a/sims/firesim b/sims/firesim
index ffe68ac7..1e7f304c 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit ffe68ac7f69795b2cccf7d9510facd5e2db4edc6
+Subproject commit 1e7f304c49507b46cf77ccf5d21a807db633f35c
diff --git a/toolchains/qemu b/toolchains/qemu
new file mode 160000
index 00000000..4f591025
--- /dev/null
+++ b/toolchains/qemu
@@ -0,0 +1 @@
+Subproject commit 4f59102571fce49af180cfc6d4cdd2b5df7bdb14