From 69d9bde3588a4110409a7a83f39ca3e88b1709b8 Mon Sep 17 00:00:00 2001
From: Ross Thompson <ross1728@gmail.com>
Date: Mon, 20 Mar 2023 11:52:10 -0500
Subject: [PATCH 1/3] Fixed bug in the tool chain install script.

---
 bin/wally-tool-chain-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 331ca13d..2c6d5851 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -62,7 +62,7 @@ make install
 # elf2hex
 cd $RISCV
 #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
 cd elf2hex
 autoreconf -i

From 67072b89e92eb389244abbf1475bfba271995260 Mon Sep 17 00:00:00 2001
From: David Harris <74973295+davidharrishmc@users.noreply.github.com>
Date: Mon, 20 Mar 2023 16:05:36 -0700
Subject: [PATCH 2/3] Update LICENSE to Soldered

---
 LICENSE | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/LICENSE b/LICENSE
index 21432e09..9d84dec0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,22 +1,14 @@
-MIT License
-
-Copyright (c) 2021 Harvey Mudd College & Oklahoma State University
-Contact: Prof. David Harris  David_Harris@hmc.edu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-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.
+// Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
+//
+// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+//
+// Licensed under the Solderpad Hardware License v 2.1 (the “License”); you may not use this file 
+// except in compliance with the License, or, at your option, the Apache License version 2.0. You 
+// may obtain a copy of the License at
+//
+// https://solderpad.org/licenses/SHL-2.1/
+//
+// 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, 
+// either express or implied. See the License for the specific language governing permissions 
+// and limitations under the License.

From e60b49952e54cea609e756b7be18343ca697df2e Mon Sep 17 00:00:00 2001
From: James Stine <james.stine@okstate.edu>
Date: Tue, 21 Mar 2023 08:36:30 -0500
Subject: [PATCH 3/3] Add correction for regression on Sail due to bug in
 recent release.  This hash is known to work (verified by Stine/Thompson). 
 May remove later if Sail ever gets fixed

---
 bin/wally-tool-chain-install.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 2c6d5851..138104c7 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -115,9 +115,12 @@ opam install sail -y
 eval $(opam config env)
 git clone https://github.com/riscv/sail-riscv.git
 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}
-ARCH=RV32 make
-ARCH=RV64 make
+ARCH=RV32 make -j ${NUM_THREADS}
+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_RV32 /usr/bin/riscv_sim_RV32