From 1d08559a0280a0b975381ea4a0591ecd9ee56059 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Sun, 31 Mar 2019 00:55:32 -0700 Subject: Merge fesvr into spike repo; bump spike to v1.0.0 --- .gitmodules | 3 --- README.md | 2 -- build-rv32ima.sh | 3 +-- build-spike-only.sh | 3 +-- build-spike-pk.sh | 3 +-- build.sh | 3 +-- riscv-fesvr | 1 - riscv-isa-sim | 2 +- 8 files changed, 5 insertions(+), 15 deletions(-) delete mode 160000 riscv-fesvr diff --git a/.gitmodules b/.gitmodules index 1c35ad9..1b3fc0a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "riscv-isa-sim"] path = riscv-isa-sim url = https://github.com/riscv/riscv-isa-sim.git -[submodule "riscv-fesvr"] - path = riscv-fesvr - url = https://github.com/riscv/riscv-fesvr.git [submodule "riscv-pk"] path = riscv-pk url = https://github.com/riscv/riscv-pk.git diff --git a/README.md b/README.md index 0e9ecb3..08ff1c1 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,6 @@ enumeration of all RISC-V opcodes executable by the simulator a boot loader for Linux and similar OS kernels, and `pk`, a proxy kernel that services system calls for a target-machine application by forwarding them to the host machine -* [riscv-fesvr](https://github.com/riscv/riscv-fesvr/), the host side of -a simulation tether that services system calls on behalf of a target machine Several RISC-V tools that were previously maintained through this repository have since been upstreamed to their parent projects. Although this repository diff --git a/build-rv32ima.sh b/build-rv32ima.sh index b094174..1f9a363 100755 --- a/build-rv32ima.sh +++ b/build-rv32ima.sh @@ -7,8 +7,7 @@ echo "Starting RISC-V Toolchain build process" -build_project riscv-fesvr --prefix=$RISCV -build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV --with-isa=rv32ima +build_project riscv-isa-sim --prefix=$RISCV --with-isa=rv32ima build_project riscv-gnu-toolchain --prefix=$RISCV --with-arch=rv32ima --with-abi=ilp32 CC= CXX= build_project riscv-pk --prefix=$RISCV --host=riscv32-unknown-elf build_project riscv-openocd --prefix=$RISCV --enable-remote-bitbang --disable-werror diff --git a/build-spike-only.sh b/build-spike-only.sh index ac3fda5..e45a77d 100755 --- a/build-spike-only.sh +++ b/build-spike-only.sh @@ -6,7 +6,6 @@ echo "Starting RISC-V Toolchain build process" -build_project riscv-fesvr --prefix=$RISCV -build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV +build_project riscv-isa-sim --prefix=$RISCV echo -e "\\nRISC-V Toolchain installation completed!" diff --git a/build-spike-pk.sh b/build-spike-pk.sh index 02f3202..af08a69 100755 --- a/build-spike-pk.sh +++ b/build-spike-pk.sh @@ -13,8 +13,7 @@ fi echo "Starting RISC-V Toolchain build process" -build_project riscv-fesvr --prefix=$RISCV -build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV +build_project riscv-isa-sim --prefix=$RISCV CC= CXX= build_project riscv-pk --prefix=$RISCV --host=riscv64-unknown-elf echo -e "\\nRISC-V Toolchain installation completed!" diff --git a/build.sh b/build.sh index 4fa357e..9aa80b6 100755 --- a/build.sh +++ b/build.sh @@ -18,8 +18,7 @@ check_version automake 1.14 "OpenOCD build" check_version autoconf 2.64 "OpenOCD build" build_project riscv-openocd --prefix=$RISCV --enable-remote-bitbang --enable-jtag_vpi --disable-werror -build_project riscv-fesvr --prefix=$RISCV -build_project riscv-isa-sim --prefix=$RISCV --with-fesvr=$RISCV +build_project riscv-isa-sim --prefix=$RISCV build_project riscv-gnu-toolchain --prefix=$RISCV CC= CXX= build_project riscv-pk --prefix=$RISCV --host=riscv64-unknown-elf build_project riscv-tests --prefix=$RISCV/riscv64-unknown-elf diff --git a/riscv-fesvr b/riscv-fesvr deleted file mode 160000 index 21e4815..0000000 --- a/riscv-fesvr +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 21e48156e8dc2d0ac53bee50c72b022f95529651 diff --git a/riscv-isa-sim b/riscv-isa-sim index 5b08bf5..2710fe5 160000 --- a/riscv-isa-sim +++ b/riscv-isa-sim @@ -1 +1 @@ -Subproject commit 5b08bf5c3cc236ed6baf6d4f2964d8efe5b1705c +Subproject commit 2710fe575e7e6a4e2418224f8d254d5ca31f6c0e -- cgit v1.1