Merge branch 'main' of https://github.com/openhwgroup/cvw into dev

This commit is contained in:
David Harris 2023-03-21 06:58:29 -07:00
commit 87baf36efd
2 changed files with 20 additions and 25 deletions

36
LICENSE
View File

@ -1,22 +1,14 @@
MIT License // Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
//
Copyright (c) 2021 Harvey Mudd College & Oklahoma State University // SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
Contact: Prof. David Harris David_Harris@hmc.edu //
// Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file
Permission is hereby granted, free of charge, to any person obtaining a copy // except in compliance with the License, or, at your option, the Apache License version 2.0. You
of this software and associated documentation files (the "Software"), to deal // may obtain a copy of the License at
in the Software without restriction, including without limitation the rights //
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell // https://solderpad.org/licenses/SHL-2.1/
copies of the Software, and to permit persons to whom the Software is //
furnished to do so, subject to the following conditions: // Unless required by applicable law or agreed to in writing, any work distributed under the
// License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
The above copyright notice and this permission notice shall be included in all // either express or implied. See the License for the specific language governing permissions
copies or substantial portions of the Software. // and limitations under the License.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -62,7 +62,7 @@ make install
# elf2hex # elf2hex
cd $RISCV cd $RISCV
#export PATH=$RISCV/riscv-gnu-toolchain/bin:$PATH #export PATH=$RISCV/riscv-gnu-toolchain/bin:$PATH
gexport PATH=$RISCV/bin:$PATH export PATH=$RISCV/bin:$PATH
git clone https://github.com/sifive/elf2hex.git git clone https://github.com/sifive/elf2hex.git
cd elf2hex cd elf2hex
autoreconf -i autoreconf -i
@ -115,9 +115,12 @@ opam install sail -y
eval $(opam config env) eval $(opam config env)
git clone https://github.com/riscv/sail-riscv.git git clone https://github.com/riscv/sail-riscv.git
cd sail-riscv cd sail-riscv
# Current bug in Sail - use hash that works for Wally
# (may remove later if Sail is ever fixed)
git checkout 4d05aa1698a0003a4f6f99e1380c743711c32052
make -j ${NUM_THREADS} make -j ${NUM_THREADS}
ARCH=RV32 make ARCH=RV32 make -j ${NUM_THREADS}
ARCH=RV64 make ARCH=RV64 make -j ${NUM_THREADS}
ln -sf $RISCV/sail-riscv/c_emulator/riscv_sim_RV64 /usr/bin/riscv_sim_RV64 ln -sf $RISCV/sail-riscv/c_emulator/riscv_sim_RV64 /usr/bin/riscv_sim_RV64
ln -sf $RISCV/sail-riscv/c_emulator/riscv_sim_RV32 /usr/bin/riscv_sim_RV32 ln -sf $RISCV/sail-riscv/c_emulator/riscv_sim_RV32 /usr/bin/riscv_sim_RV32