Merge pull request #4 from sifive/qemu-integration

All for the 2019.05 release
sifive · Jun 27, 2019 · 688fe4b · 688fe4b
2 parents f096c82 + 9a25ccb
commit 688fe4b
Show file tree

Hide file tree

Showing 10 changed files with 344 additions and 18 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -22,3 +22,6 @@
 [submodule "src/riscv-openocd"]
 	path = src/riscv-openocd
 	url = git://github.com/riscv/riscv-openocd.git
+[submodule "src/riscv-qemu"]
+	path = src/riscv-qemu
+	url = git://github.com/sifive/riscv-qemu.git
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -17,6 +17,9 @@ we use to build these tools.
     * OpenOCD
     * LibFTDI
     * LibUSB
+* RISC-V QEMU (`riscv-qemu-*`)
+    * QEMU (riscv32-softmmu + riscv64-softmmu)
+    * ZLib, LibFFI, LibIConv, GetText, GLib, LibPNG, JPEG, PixMan
 
 All the packages has a uniquely named root folder, making it easy to untar/unzip'ing
 multiple versions next to each other.
@@ -34,7 +37,7 @@ which is build using the MinGW toolchain.
 
 ### Prerequisites
 
-Several standard packages are needed to build the tools on the different supported platforms.  
+Several standard packages are needed to build the tools on the different supported platforms.  
 
 
 On Ubuntu, executing the following command should suffice:

diff --git a/scripts/openocd.sed b/scripts/openocd.sed
@@ -0,0 +1,4 @@
+s/.Open On-Chip Debugger . VERSION RELSTR . .. PKGBLDDATE .../\"Open On-Chip Debugger \" VERSION \" \(SIFIVE_PACKAGE_VERSION\)\"/
+s/.Open On-Chip Debugger . VERSION RELSTR/\"Open On-Chip Debugger \" VERSION \" \(SIFIVE_PACKAGE_VERSION\)\"/
+s/For bug reports, read/For bug reports:/
+s/http:\/\/openocd\.org\/doc\/doxygen\/bugs\.html/https:\/\/github.com\/sifive\/freedom-tools\/issues/
diff --git a/scripts/qemu-common.sed b/scripts/qemu-common.sed
@@ -0,0 +1 @@
+s/See <https:\/\/qemu\.org\/contribute\/report-a-bug> for how to report bugs\./For bug reports: https:\/\/github.com\/sifive\/freedom-tools\/issues/
diff --git a/scripts/qemu-configure.sed b/scripts/qemu-configure.sed
@@ -0,0 +1 @@
+s/libs_qga=\"\"/libs_qga=\"$SIFIVE_LIBS_QGA\"/
diff --git a/scripts/qemu-vl.sed b/scripts/qemu-vl.sed
@@ -0,0 +1 @@
+:a;N;$!ba;s/case QEMU_OPTION_version:.*case QEMU_OPTION_m:/case QEMU_OPTION_version: version\(\)\; if \(argc < 3\) \{ exit\(0\)\; \} break\; case QEMU_OPTION_m:/
diff --git a/src/riscv-gdb b/src/riscv-gdb
diff --git a/src/riscv-openocd b/src/riscv-openocd
diff --git a/src/riscv-qemu b/src/riscv-qemu
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		s/See <https:\/\/qemu\.org\/contribute\/report-a-bug> for how to report bugs\./For bug reports: https:\/\/github.com\/sifive\/freedom-tools\/issues/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		:a;N;$!ba;s/case QEMU_OPTION_version:.*case QEMU_OPTION_m:/case QEMU_OPTION_version: version\(\)\; if \(argc < 3\) \{ exit\(0\)\; \} break\; case QEMU_OPTION_m:/