Merge pull request #10 from sifive/xc3sprog-integration-2

Xc3sprog integration and a few other updates
sifive · Aug 6, 2019 · be074c1 · be074c1
2 parents 688fe4b + 3c23b23
commit be074c1
Show file tree

Hide file tree

Showing 9 changed files with 235 additions and 47 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "src/riscv-qemu"]
 	path = src/riscv-qemu
 	url = git://github.com/sifive/riscv-qemu.git
+[submodule "src/xc3sprog"]
+	path = src/xc3sprog
+	url = git://github.com/sifive/xc3sprog.git
diff --git a/Makefile b/Makefile
diff --git a/scripts/qemu-sifive-e.sed b/scripts/qemu-sifive-e.sed
@@ -0,0 +1 @@
+s/\[SIFIVE_E_DTIM\] =     { 0x80000000,     0x4000 }/\[SIFIVE_E_DTIM\] =     { 0x80000000,   0x400000 }/
diff --git a/scripts/qemu-vl.sed b/scripts/qemu-vl.sed
@@ -1 +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:/
+:a;N;$!ba;s/case QEMU_OPTION_version:.*case QEMU_OPTION_m:/case QEMU_OPTION_version: version\(\)\; fflush\(stdout\)\; if \(argc < 3\) \{ exit\(0\)\; \} break\; case QEMU_OPTION_m:/
diff --git a/scripts/xc3sprog-cmake.sed b/scripts/xc3sprog-cmake.sed
@@ -0,0 +1 @@
+/target_link_libraries/s/${CONDITIONAL_LIBS}/${CONDITIONAL_LIBS} ${CMAKE_DL_LIBS} ${LIBRT_LIBRARIES}/g
diff --git a/scripts/xc3sprog-mingw32.sed b/scripts/xc3sprog-mingw32.sed
@@ -0,0 +1 @@
+s/i686-w64-mingw32/x86_64-w64-mingw32/
diff --git a/scripts/xc3sprog.sed b/scripts/xc3sprog.sed
@@ -0,0 +1,2 @@
+s/xc3sprog project \$Rev\$ OS/xc3sprog project \(SIFIVE_PACKAGE_VERSION\)\ OS/
+s/http:\/\/sourceforge\.net\/mail\/?group_id=170565 /https:\/\/github.com\/sifive\/freedom-tools\/issues/
diff --git a/src/riscv-openocd b/src/riscv-openocd
diff --git a/src/xc3sprog b/src/xc3sprog