From c6bd7bbefcdf74d7c48b8360805a6bb399c3b06a Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 23 Nov 2024 18:36:49 -0800
Subject: [PATCH 01/25] Update distro check print formatting

---
 bin/wally-distro-check.sh | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/bin/wally-distro-check.sh b/bin/wally-distro-check.sh
index 92d284b05..8f4af6958 100755
--- a/bin/wally-distro-check.sh
+++ b/bin/wally-distro-check.sh
@@ -41,32 +41,36 @@ ENDC='\033[0m' # Reset to default color
 # Print section header
 section_header() {
     if tput cols > /dev/null 2>&1; then
-        printf "${SECTION_COLOR}%$(tput cols)s" | tr ' ' '#'
-        printf "%$(tput cols)s" | tr ' ' '#'
-        echo -e "$1"
-        printf "%$(tput cols)s" | tr ' ' '#'
-        printf "%$(tput cols)s${ENDC}" | tr ' ' '#'
+        printf "${SECTION_COLOR}%$(tput cols)s\n" | tr ' ' '#'
+        printf "%$(tput cols)s\n" | tr ' ' '#'
+        printf "%s\n" "$1"
+        printf "%$(tput cols)s\n" | tr ' ' '#'
+        printf "%$(tput cols)s${ENDC}\n" | tr ' ' '#'
     else
-        echo -e "${SECTION_COLOR}$1${ENDC}"
+        printf "${SECTION_COLOR}%s\n${ENDC}" "$1"
     fi
 }
 
 section_header "Checking System Requirements and Configuring Installation"
 
 # Get distribution information
-test -e /etc/os-release && os_release="/etc/os-release" || os_release="/usr/lib/os-release"
-source "$os_release"
+if [ -f /etc/os-release ]; then
+    source /etc/os-release
+else
+    printf "${FAIL_COLOR}%s\n${ENDC}" "/etc/os-release file not found. Distribution unknown."
+    PRETTY_NAME=UNKNOWN
+fi
 
 # Check for compatible distro
 if [[ "$ID" == rhel || "$ID_LIKE" == *rhel* ]]; then
     export FAMILY=rhel
     if [ "$ID" != rhel ] && [ "$ID" != rocky ] && [ "$ID" != almalinux ]; then
-        printf "${WARNING_COLOR}%s\n${ENDC}" "For Red Hat family distros, the Wally install script has only been tested on RHEL, Rocky Linux," \
+        printf "${WARNING_COLOR}%s%s\n${ENDC}" "For Red Hat family distros, the Wally install script has only been tested on RHEL, Rocky Linux," \
             " and AlmaLinux. Your distro is $PRETTY_NAME. The regular Red Hat install will be attempted, but there may be issues."
     fi
     export RHEL_VERSION="${VERSION_ID:0:1}"
     if (( RHEL_VERSION < 8 )); then
-        echo "${FAIL_COLOR}The Wally install script is only compatible with versions 8 and 9 of RHEL, Rocky Linux, and AlmaLinux. You have version $VERSION.${ENDC}"
+        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script is only compatible with versions 8 and 9 of RHEL, Rocky Linux, and AlmaLinux. You have version $VERSION."
         exit 1
     fi
 elif [[ "$ID" == ubuntu || "$ID_LIKE" == *ubuntu* ]]; then
@@ -77,16 +81,16 @@ elif [[ "$ID" == ubuntu || "$ID_LIKE" == *ubuntu* ]]; then
     fi
     export UBUNTU_VERSION="${VERSION_ID:0:2}"
     if (( UBUNTU_VERSION < 20 )); then
-        echo "${FAIL_COLOR}The Wally install script has only been tested with versions 20.04 LTS, 22.04 LTS, and 24.04 LTS of Ubuntu. You have version $VERSION.${ENDC}"
+        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script has only been tested with Ubuntu versions 20.04 LTS, 22.04 LTS, and 24.04 LTS. You have version $VERSION."
         exit 1
     fi
 else
-    printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script is currently only compatible with Ubuntu and Red Hat family " \
+    printf "${FAIL_COLOR}%s%s%s\n${ENDC}" "The Wally install script is currently only compatible with Ubuntu and Red Hat family " \
         "(RHEL, Rocky Linux, or AlmaLinux) distros. Your detected distro is $PRETTY_NAME. You may try manually running the " \
         "commands in this script, but it is likely that some will need to be altered."
     exit 1
 fi
 
-echo -e "${OK_COLOR}${UNDERLINE}Detected information${ENDC}"
+printf "${OK_COLOR}${UNDERLINE}%s\n${ENDC}" "Detected information"
 echo "Distribution: $PRETTY_NAME"
 echo "Version: $VERSION"

From 4ff7289803c9cd66eb11d92f9e2ddfb4bf3d5b0f Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 23 Nov 2024 19:27:07 -0800
Subject: [PATCH 02/25] Fix installation comments

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

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 8fe418272..1ba69ca16 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -118,7 +118,7 @@ if [ "$1" == "--clean" ] || [ "$2" == "--clean" ]; then
     shift
 fi
 
-# Check for clean flag
+# Check for no-buildroot flag
 if [ "$1" == "--no-buildroot" ] || [ "$2" == "--no-buildroot" ]; then
     no_buidroot=true
     shift
@@ -269,11 +269,10 @@ fi
 # and the GNU Debugger Project (gdb). It is a collection of tools used to compile RISC-V programs.
 # To install GCC from source can take hours to compile.
 # This configuration enables multilib to target many flavors of RISC-V.
-# This book is tested with GCC 13.2.0
+# This book is tested with GCC 13.2.0 and 14.2.0.
 section_header "Installing/Updating RISC-V GNU Toolchain"
 STATUS="riscv-gnu-toolchain"
 cd "$RISCV"
-# Temporarily pin riscv-gnu-toolchain to use GCC 13.2.0. GCC 14 does not work with the Q extension.
 if git_check "riscv-gnu-toolchain" "https://github.com/riscv/riscv-gnu-toolchain" "$RISCV/riscv-gnu-toolchain/stamps/build-gcc-newlib-stage2"; then
     cd "$RISCV"/riscv-gnu-toolchain
     git reset --hard && git clean -f && git checkout master && git pull && git submodule update

From f11799385e56272647dc8aa02951e7563c3de555 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 23 Nov 2024 20:04:39 -0800
Subject: [PATCH 03/25] Add support for debian 12 to install script

---
 bin/wally-distro-check.sh    | 11 +++++++++++
 bin/wally-package-install.sh |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/bin/wally-distro-check.sh b/bin/wally-distro-check.sh
index 8f4af6958..bd4de121b 100755
--- a/bin/wally-distro-check.sh
+++ b/bin/wally-distro-check.sh
@@ -84,6 +84,17 @@ elif [[ "$ID" == ubuntu || "$ID_LIKE" == *ubuntu* ]]; then
         printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script has only been tested with Ubuntu versions 20.04 LTS, 22.04 LTS, and 24.04 LTS. You have version $VERSION."
         exit 1
     fi
+elif [[ "$ID" == debian || "$ID_LIKE" == *debian* ]]; then
+    export FAMILY=debian
+    if [ "$ID" != debian ]; then
+        printf "${WARNING_COLOR}%s\n${ENDC}" "For Debian family distros, the Wally install script has only been tested on standard Debian (and Ubuntu). Your distro " \
+            "is $PRETTY_NAME. The regular Debian install will be attempted, but there may be issues."
+    fi
+    export DEBIAN_VERSION="$VERSION_ID"
+    if (( DEBIAN_VERSION < 12 )); then
+        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script has only been tested with Debian version 12. You have version $VERSION."
+        exit 1
+    fi
 else
     printf "${FAIL_COLOR}%s%s%s\n${ENDC}" "The Wally install script is currently only compatible with Ubuntu and Red Hat family " \
         "(RHEL, Rocky Linux, or AlmaLinux) distros. Your detected distro is $PRETTY_NAME. You may try manually running the " \
diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh
index 1fc003189..aadfed2b0 100755
--- a/bin/wally-package-install.sh
+++ b/bin/wally-package-install.sh
@@ -61,7 +61,7 @@ if [ "$FAMILY" == rhel ]; then
     fi
     # A newer version of gcc is required for qemu
     OTHER_PACKAGES=(gcc-toolset-13)
-elif [ "$FAMILY" == ubuntu ]; then
+elif [[ "$FAMILY" == ubuntu || "$FAMILY" == debian ]]; then
     if (( UBUNTU_VERSION >= 24 )); then
         PYTHON_VERSION=python3.12
         VERILATOR_PACKAGES+=(mold) # Not availale in Ubuntu 20.04, nice for Verilator
@@ -71,11 +71,14 @@ elif [ "$FAMILY" == ubuntu ]; then
     elif (( UBUNTU_VERSION >= 20 )); then
         PYTHON_VERSION=python3.9
         OTHER_PACKAGES+=(gcc-10 g++-10 cpp-10) # Newer version of gcc needed for Verilator
+    elif (( DEBIAN_VERSION >= 12 )); then
+        PYTHON_VERSION=python3.11
+        VERILATOR_PACKAGES+=(mold) # Not availale in Ubuntu 20.04, nice for Verilator
     fi
     PACKAGE_MANAGER="DEBIAN_FRONTEND=noninteractive apt-get"
     UPDATE_COMMAND="sudo $PACKAGE_MANAGER update -y && sudo $PACKAGE_MANAGER upgrade -y --with-new-pkgs"
     GENERAL_PACKAGES+=(rsync git make cmake "$PYTHON_VERSION" python3-pip "$PYTHON_VERSION"-venv curl wget tar pkg-config dialog mutt ssmtp)
-    GNU_PACKAGES+=(autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat1-dev ninja-build libglib2.0-dev libslirp-dev)
+    GNU_PACKAGES+=(autoconf automake autotools-dev libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat1-dev ninja-build libglib2.0-dev libslirp-dev)
     QEMU_PACKAGES+=(libfdt-dev libpixman-1-dev)
     SPIKE_PACKAGES+=(device-tree-compiler libboost-regex-dev libboost-system-dev)
     VERILATOR_PACKAGES+=(help2man perl g++ clang ccache libunwind-dev libgoogle-perftools-dev numactl perl-doc libfl2 libfl-dev zlib1g)

From 3e9d5a48df8fbf35505eeefe42e0ffb017d6c681 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 23 Nov 2024 20:15:25 -0800
Subject: [PATCH 04/25] Add debian 12 to installation CI and update matrix
 formation

---
 .github/workflows/install.yml | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index b065cd924..c78b6b195 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -38,25 +38,37 @@ jobs:
           - name: ubuntu-20.04
             os: ubuntu-20.04
             container: null
+            regresssionFail: true
           - name: ubuntu-22.04
             os: ubuntu-22.04
             container: null
           - name: ubuntu-24.04
             os: ubuntu-24.04
             container: null
+          # Debian Installations
+          - name: debian-12
+            os: ubuntu-latest
+            image: debian:12
+            imageFamily: debian
           # Red Hat Installations
           - name: rocky-8
             os: ubuntu-latest
             image: rockylinux:8
+            imageFamily: redhat
+            regressionFail: true
           - name: rocky-9
             os: ubuntu-latest
             image: rockylinux:9
+            imageFamily: redhat
           - name: almalinux-8
             os: ubuntu-latest
             image: almalinux:8
+            imageFamily: redhat
+            regressionFail: true
           - name: almalinux-9
             os: ubuntu-latest
             image: almalinux:9
+            imageFamily: redhat
           # User level installation
           - name: user-install
             os: ubuntu-latest
@@ -82,11 +94,16 @@ jobs:
 
     steps:
       # Docker images need git installed or the checkout action fails
-      - name: Install Dependencies for Red Hat
+      - name: Install Dependencies for Container Image
         if: ${{ matrix.image != null }}
         run: |
-            dnf install -y sudo git
-            dnf install curl -y --allowerasing || true
+            if [ ${{ matrix.imageFamily }} == "debian" ]; then
+              apt-get update
+              apt-get install -y sudo git
+            elif [ ${{ matrix.imageFamily }} == "redhat" ]; then
+              dnf install -y sudo git
+              dnf install curl -y --allowerasing || true
+            fi
       # Only clone submodules needed for standard tests/regression to save space
       - uses: actions/checkout@v4
       - name: Clone Necessary Submodules
@@ -140,12 +157,12 @@ jobs:
               df -h
       # Run standard regression, skipping distros that are known to be broken with Verilator
       - name: Regression
-        if: ${{ matrix.name != 'ubuntu-20.04' && matrix.name != 'rocky-8' && matrix.name != 'almalinux-8'}}
+        if: ${{ matrix.regressionFail != true }}
         run: |
               source setup.sh
               regression-wally
       - name: Lint + wsim Test Only (for distros with broken Verilator sim)
-        if: ${{ matrix.name == 'ubuntu-20.04' || matrix.name == 'rocky-8' || matrix.name == 'almalinux-8'}}
+        if: ${{ matrix.regressionFail == true }}
         run: |
               source setup.sh
               mkdir -p $WALLY/sim/verilator/logs/

From 4f5db12b2cb441a444eb09e996db77c4870dca57 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 23 Nov 2024 21:32:42 -0800
Subject: [PATCH 05/25] Download binary for mold on Ubuntu 20.04

---
 bin/wally-package-install.sh    | 5 ++---
 bin/wally-tool-chain-install.sh | 9 +++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh
index aadfed2b0..e780298bd 100755
--- a/bin/wally-package-install.sh
+++ b/bin/wally-package-install.sh
@@ -64,16 +64,15 @@ if [ "$FAMILY" == rhel ]; then
 elif [[ "$FAMILY" == ubuntu || "$FAMILY" == debian ]]; then
     if (( UBUNTU_VERSION >= 24 )); then
         PYTHON_VERSION=python3.12
-        VERILATOR_PACKAGES+=(mold) # Not availale in Ubuntu 20.04, nice for Verilator
     elif (( UBUNTU_VERSION >= 22 )); then
         PYTHON_VERSION=python3.11
-        VERILATOR_PACKAGES+=(mold) # Not availale in Ubuntu 20.04, nice for Verilator
     elif (( UBUNTU_VERSION >= 20 )); then
         PYTHON_VERSION=python3.9
         OTHER_PACKAGES+=(gcc-10 g++-10 cpp-10) # Newer version of gcc needed for Verilator
     elif (( DEBIAN_VERSION >= 12 )); then
         PYTHON_VERSION=python3.11
-        VERILATOR_PACKAGES+=(mold) # Not availale in Ubuntu 20.04, nice for Verilator
+    if (( UBUNTU_VERSION != 20 )); then
+        VERILATOR_PACKAGES+=(mold) # Not availale in Ubuntu 20.04, binary will be downloaded instead
     fi
     PACKAGE_MANAGER="DEBIAN_FRONTEND=noninteractive apt-get"
     UPDATE_COMMAND="sudo $PACKAGE_MANAGER update -y && sudo $PACKAGE_MANAGER upgrade -y --with-new-pkgs"
diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 1ba69ca16..c22aed822 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -263,6 +263,15 @@ if (( RHEL_VERSION == 8 )); then
     fi
 fi
 
+# Mold needed for Verilator
+if (( UBUNTU_VERSION == 20 )); then
+    STATUS="mold"
+    if [ ! -e "$RISCV"/bin/mold ]; then
+        section_header "Installing mold"
+        cd "$RISCV"
+        wget -nv --retry-connrefused $retry_on_host_error https://github.com/rui314/mold/releases/download/v2.34.1/mold-2.34.1-x86_64-linux.tar.gz
+    fi
+fi
 
 # RISC-V GNU Toolchain (https://github.com/riscv-collab/riscv-gnu-toolchain)
 # The RISC-V GNU Toolchain includes the GNU Compiler Collection (gcc), GNU Binutils, Newlib,

From 6e680ae5613bd5d24ea7b71fb1527d821b99be25 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 23 Nov 2024 21:51:57 -0800
Subject: [PATCH 06/25] Add support for Debian 11 to installation script

---
 bin/wally-distro-check.sh       | 4 ++--
 bin/wally-package-install.sh    | 8 ++++++--
 bin/wally-tool-chain-install.sh | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bin/wally-distro-check.sh b/bin/wally-distro-check.sh
index bd4de121b..5dfbf015e 100755
--- a/bin/wally-distro-check.sh
+++ b/bin/wally-distro-check.sh
@@ -91,8 +91,8 @@ elif [[ "$ID" == debian || "$ID_LIKE" == *debian* ]]; then
             "is $PRETTY_NAME. The regular Debian install will be attempted, but there may be issues."
     fi
     export DEBIAN_VERSION="$VERSION_ID"
-    if (( DEBIAN_VERSION < 12 )); then
-        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script has only been tested with Debian version 12. You have version $VERSION."
+    if (( DEBIAN_VERSION < 11 )); then
+        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script has only been tested with Debian versions 11 and 12. You have version $VERSION."
         exit 1
     fi
 else
diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh
index e780298bd..fe3c9bf1c 100755
--- a/bin/wally-package-install.sh
+++ b/bin/wally-package-install.sh
@@ -71,8 +71,12 @@ elif [[ "$FAMILY" == ubuntu || "$FAMILY" == debian ]]; then
         OTHER_PACKAGES+=(gcc-10 g++-10 cpp-10) # Newer version of gcc needed for Verilator
     elif (( DEBIAN_VERSION >= 12 )); then
         PYTHON_VERSION=python3.11
-    if (( UBUNTU_VERSION != 20 )); then
-        VERILATOR_PACKAGES+=(mold) # Not availale in Ubuntu 20.04, binary will be downloaded instead
+    elif (( DEBIAN_VERSION >= 11 )); then
+        PYTHON_VERSION=python3.9
+    fi
+    # Mold not available in older distros for Verilator, will download binary instead
+    if (( UBUNTU_VERSION != 20 && DEBIAN_VERSION != 11 )); then
+        VERILATOR_PACKAGES+=(mold)
     fi
     PACKAGE_MANAGER="DEBIAN_FRONTEND=noninteractive apt-get"
     UPDATE_COMMAND="sudo $PACKAGE_MANAGER update -y && sudo $PACKAGE_MANAGER upgrade -y --with-new-pkgs"
diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index c22aed822..10c4276c7 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -264,7 +264,7 @@ if (( RHEL_VERSION == 8 )); then
 fi
 
 # Mold needed for Verilator
-if (( UBUNTU_VERSION == 20 )); then
+if (( UBUNTU_VERSION == 20  || DEBIAN_VERSION == 11 )); then
     STATUS="mold"
     if [ ! -e "$RISCV"/bin/mold ]; then
         section_header "Installing mold"

From 5382b481e8338b06ac330dc1fdb8858a138a9a4e Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 23 Nov 2024 22:01:48 -0800
Subject: [PATCH 07/25] Fix mold install

---
 bin/wally-tool-chain-install.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 10c4276c7..4bfa2c9a3 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -269,7 +269,12 @@ if (( UBUNTU_VERSION == 20  || DEBIAN_VERSION == 11 )); then
     if [ ! -e "$RISCV"/bin/mold ]; then
         section_header "Installing mold"
         cd "$RISCV"
-        wget -nv --retry-connrefused $retry_on_host_error https://github.com/rui314/mold/releases/download/v2.34.1/mold-2.34.1-x86_64-linux.tar.gz
+        wget -nv --retry-connrefused $retry_on_host_error --output-document=mold.tar.gz https://github.com/rui314/mold/releases/download/v2.34.1/mold-2.34.1-x86_64-linux.tar.gz
+        tar xz --directory="$RISCV" --strip-components=1 -f mold.tar.gz
+        rm -f mold.tar.gz
+        echo -e "${SUCCESS_COLOR}Mold successfully installed/updated!${ENDC}"
+    else
+        echo -e "${SUCCESS_COLOR}Mold already installed.${ENDC}"
     fi
 fi
 

From 242611c8ea392efb5eb60e9e703fd96504ca5f0d Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 23 Nov 2024 22:08:29 -0800
Subject: [PATCH 08/25] Debian images don't have unzip installed by default;
 used by Buildroot

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

diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh
index fe3c9bf1c..69dccbc6c 100755
--- a/bin/wally-package-install.sh
+++ b/bin/wally-package-install.sh
@@ -80,7 +80,7 @@ elif [[ "$FAMILY" == ubuntu || "$FAMILY" == debian ]]; then
     fi
     PACKAGE_MANAGER="DEBIAN_FRONTEND=noninteractive apt-get"
     UPDATE_COMMAND="sudo $PACKAGE_MANAGER update -y && sudo $PACKAGE_MANAGER upgrade -y --with-new-pkgs"
-    GENERAL_PACKAGES+=(rsync git make cmake "$PYTHON_VERSION" python3-pip "$PYTHON_VERSION"-venv curl wget tar pkg-config dialog mutt ssmtp)
+    GENERAL_PACKAGES+=(rsync git make cmake "$PYTHON_VERSION" python3-pip "$PYTHON_VERSION"-venv curl wget tar unzip pkg-config dialog mutt ssmtp)
     GNU_PACKAGES+=(autoconf automake autotools-dev libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat1-dev ninja-build libglib2.0-dev libslirp-dev)
     QEMU_PACKAGES+=(libfdt-dev libpixman-1-dev)
     SPIKE_PACKAGES+=(device-tree-compiler libboost-regex-dev libboost-system-dev)

From 459b86b22ad63bd253528d3f90987bd73f244904 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sat, 23 Nov 2024 22:09:38 -0800
Subject: [PATCH 09/25] Add Debian 11 to build matrix

---
 .github/workflows/install.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index c78b6b195..c7c9bd9e1 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -50,6 +50,10 @@ jobs:
             os: ubuntu-latest
             image: debian:12
             imageFamily: debian
+          - name: debian-11
+            os: ubuntu-latest
+            image: debian:11
+            imageFamily: debian
           # Red Hat Installations
           - name: rocky-8
             os: ubuntu-latest

From 42bf426e1c0e8f362cc8ffd46fbfc19965e3a921 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sun, 24 Nov 2024 01:32:20 -0800
Subject: [PATCH 10/25] Fix typo

---
 .github/workflows/install.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index c7c9bd9e1..ff0e93181 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -38,7 +38,7 @@ jobs:
           - name: ubuntu-20.04
             os: ubuntu-20.04
             container: null
-            regresssionFail: true
+            regressionFail: true
           - name: ubuntu-22.04
             os: ubuntu-22.04
             container: null

From 26d635c0ac6e9fe63da5ed9438ff50f17e325fc9 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sun, 24 Nov 2024 12:57:03 -0800
Subject: [PATCH 11/25] Factor out packags that are common across distros for
 easier maintenance

---
 bin/wally-package-install.sh | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh
index 69dccbc6c..dad2f9746 100755
--- a/bin/wally-package-install.sh
+++ b/bin/wally-package-install.sh
@@ -43,18 +43,24 @@ if [ -z "$FAMILY" ]; then
 fi
 
 
-# Generate list of packages to install and package manager commands based on distro
 # Packages are grouped by which tool requires them. If multiple tools need a package, it is included in the first tool only
+# Packages that are constant across distros
+GENERAL_PACKAGES+=(rsync git make cmake curl wget tar unzip bzip2 dialog mutt ssmtp)
+GNU_PACKAGES+=(autoconf automake gawk bison flex texinfo gperf libtool ninja-build patchutils bc gcc)
+VERILATOR_PACKAGES+=(help2man perl clang ccache numactl)
+BUILDROOT_PACKAGES+=(ncurses-base cpio)
+
+# Distro specific packages and package manager
 if [ "$FAMILY" == rhel ]; then
     PYTHON_VERSION=python3.12
-    PACKAGE_MANAGER="dnf"
-    UPDATE_COMMAND="sudo $PACKAGE_MANAGER update -y"
-    GENERAL_PACKAGES+=(which rsync git make cmake "$PYTHON_VERSION" "$PYTHON_VERSION"-pip curl wget tar pkgconf-pkg-config dialog mutt ssmtp)
-    GNU_PACKAGES+=(autoconf automake  libmpc-devel mpfr-devel gmp-devel gawk bison flex texinfo gperf libtool patchutils bc gcc gcc-c++ zlib-devel expat-devel libslirp-devel)
-    QEMU_PACKAGES+=(glib2-devel libfdt-devel pixman-devel bzip2 ninja-build)
+    PACKAGE_MANAGER="dnf -y"
+    UPDATE_COMMAND="sudo $PACKAGE_MANAGER update"
+    GENERAL_PACKAGES+=(which "$PYTHON_VERSION" "$PYTHON_VERSION"-pip pkgconf-pkg-config gcc-c++)
+    GNU_PACKAGES+=(libmpc-devel mpfr-devel gmp-devel zlib-devel expat-devel libslirp-devel)
+    QEMU_PACKAGES+=(glib2-devel libfdt-devel pixman-devel)
     SPIKE_PACKAGES+=(dtc boost-regex boost-system)
-    VERILATOR_PACKAGES+=(help2man perl clang ccache gperftools numactl mold)
-    BUILDROOT_PACKAGES+=(ncurses-base ncurses ncurses-libs ncurses-devel gcc-gfortran cpio) # gcc-gfortran is only needed for compiling spec benchmarks on buildroot linux
+    VVERILATOR_PACKAGES+=(gperftools mold)
+    BUILDROOT_PACKAGES+=(ncurses ncurses-libs ncurses-devel gcc-gfortran) # gcc-gfortran is only needed for compiling spec benchmarks on buildroot linux
     # Extra packages not availale in rhel8, nice for Verilator
     if (( RHEL_VERSION >= 9 )); then
         VERILATOR_PACKAGES+=(perl-doc)
@@ -78,14 +84,14 @@ elif [[ "$FAMILY" == ubuntu || "$FAMILY" == debian ]]; then
     if (( UBUNTU_VERSION != 20 && DEBIAN_VERSION != 11 )); then
         VERILATOR_PACKAGES+=(mold)
     fi
-    PACKAGE_MANAGER="DEBIAN_FRONTEND=noninteractive apt-get"
-    UPDATE_COMMAND="sudo $PACKAGE_MANAGER update -y && sudo $PACKAGE_MANAGER upgrade -y --with-new-pkgs"
-    GENERAL_PACKAGES+=(rsync git make cmake "$PYTHON_VERSION" python3-pip "$PYTHON_VERSION"-venv curl wget tar unzip pkg-config dialog mutt ssmtp)
-    GNU_PACKAGES+=(autoconf automake autotools-dev libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat1-dev ninja-build libglib2.0-dev libslirp-dev)
+    PACKAGE_MANAGER="DEBIAN_FRONTEND=noninteractive apt-get -y"
+    UPDATE_COMMAND="sudo $PACKAGE_MANAGER update && sudo $PACKAGE_MANAGER upgrade --with-new-pkgs"
+    GENERAL_PACKAGES+=("$PYTHON_VERSION" python3-pip "$PYTHON_VERSION"-venv pkg-config g++)
+    GNU_PACKAGES+=(autotools-dev libmpc-dev libmpfr-dev libgmp-dev build-essential zlib1g-dev libexpat1-dev libglib2.0-dev libslirp-dev)
     QEMU_PACKAGES+=(libfdt-dev libpixman-1-dev)
     SPIKE_PACKAGES+=(device-tree-compiler libboost-regex-dev libboost-system-dev)
-    VERILATOR_PACKAGES+=(help2man perl g++ clang ccache libunwind-dev libgoogle-perftools-dev numactl perl-doc libfl2 libfl-dev zlib1g)
-    BUILDROOT_PACKAGES+=(ncurses-base ncurses-bin libncurses-dev gfortran cpio) # gfortran is only needed for compiling spec benchmarks on buildroot linux
+    VERILATOR_PACKAGES+=(libunwind-dev libgoogle-perftools-dev perl-doc libfl2 libfl-dev zlib1g)
+    BUILDROOT_PACKAGES+=(ncurses-bin libncurses-dev gfortran) # gfortran is only needed for compiling spec benchmarks on buildroot linux
     VIVADO_PACKAGES+=(libncurses*) # Vivado hangs on the third stage of installation without this
 fi
 
@@ -128,7 +134,7 @@ else
     # Update and Upgrade tools
     eval "$UPDATE_COMMAND"
     # Install packages listed above using appropriate package manager
-    sudo $PACKAGE_MANAGER install -y "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}" "${VIVADO_PACKAGES[@]}"
+    sudo $PACKAGE_MANAGER install "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}" "${VIVADO_PACKAGES[@]}"
 
     # Post install steps
     # Vivado looks for ncurses5 libraries, but Ubuntu 24.04 only has ncurses6

From 1eac4af940521b7a8466712a0934c3fdb33ae071 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sun, 24 Nov 2024 13:03:59 -0800
Subject: [PATCH 12/25] Fix installation failure message to include Debian

---
 bin/wally-distro-check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/wally-distro-check.sh b/bin/wally-distro-check.sh
index 5dfbf015e..399ee2071 100755
--- a/bin/wally-distro-check.sh
+++ b/bin/wally-distro-check.sh
@@ -96,7 +96,7 @@ elif [[ "$ID" == debian || "$ID_LIKE" == *debian* ]]; then
         exit 1
     fi
 else
-    printf "${FAIL_COLOR}%s%s%s\n${ENDC}" "The Wally install script is currently only compatible with Ubuntu and Red Hat family " \
+    printf "${FAIL_COLOR}%s%s%s\n${ENDC}" "The Wally install script is currently only compatible with Ubuntu, Debian, and Red Hat family " \
         "(RHEL, Rocky Linux, or AlmaLinux) distros. Your detected distro is $PRETTY_NAME. You may try manually running the " \
         "commands in this script, but it is likely that some will need to be altered."
     exit 1

From 99047ae8c41be44d2225ac38345e7029ff7cf589 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sun, 24 Nov 2024 13:10:33 -0800
Subject: [PATCH 13/25] Add Debian support to README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e302e33f6..e26454b1a 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Then fork and clone the repo, source setup, make the tests and run regression
 > This section describes the open source toolchain installation.
 
 ### Compatibility
-The current version of the toolchain has been tested on Ubuntu (versions 20.04 LTS, 22.04 LTS, and 24.04 LTS) and on Red Hat/Rocky/AlmaLinux (versions 8 and 9).
+The current version of the toolchain has been tested on Ubuntu (versions 20.04 LTS, 22.04 LTS, and 24.04 LTS), Debian (versions 11 and 12), and Red Hat/Rocky/AlmaLinux (versions 8 and 9). Only the latest minor release of each major version is tested.
 
 > [!WARNING]
 > - Ubuntu 22.04LTS is incompatible with Synopsys Design Compiler.

From 064d9fda9191144d919c92220cde955d157f0cf2 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sun, 24 Nov 2024 15:48:34 -0800
Subject: [PATCH 14/25] Add debian to package check

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

diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh
index dad2f9746..318cb51ac 100755
--- a/bin/wally-package-install.sh
+++ b/bin/wally-package-install.sh
@@ -103,7 +103,7 @@ if [ "${1}" == "--check" ]; then
         for pack in "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}"; do
             rpm -q "$pack" > /dev/null || (echo -e "${FAIL_COLOR}Missing packages detected (${WARNING_COLOR}$pack${FAIL_COLOR}). Run as root to auto-install or run wally-package-install.sh first.${ENDC}" && exit 1)
         done
-    elif [ "$FAMILY" == ubuntu ]; then
+    elif [[ "$FAMILY" == ubuntu || "$FAMILY" == debian ]]; then
         for pack in "${GENERAL_PACKAGES[@]}" "${GNU_PACKAGES[@]}" "${QEMU_PACKAGES[@]}" "${SPIKE_PACKAGES[@]}" "${VERILATOR_PACKAGES[@]}" "${BUILDROOT_PACKAGES[@]}" "${OTHER_PACKAGES[@]}"; do
             dpkg -l "$pack" | grep "ii" > /dev/null || (echo -e "${FAIL_COLOR}Missing packages detected (${WARNING_COLOR}$pack${FAIL_COLOR}). Run as root to auto-install or run wally-package-install.sh first." && exit 1)
         done

From 81f036088d1e62df281baa18847b40266fd64185 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sun, 24 Nov 2024 15:51:57 -0800
Subject: [PATCH 15/25] Fix installation messages

---
 bin/wally-distro-check.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/wally-distro-check.sh b/bin/wally-distro-check.sh
index 399ee2071..db0699fd2 100755
--- a/bin/wally-distro-check.sh
+++ b/bin/wally-distro-check.sh
@@ -65,38 +65,38 @@ fi
 if [[ "$ID" == rhel || "$ID_LIKE" == *rhel* ]]; then
     export FAMILY=rhel
     if [ "$ID" != rhel ] && [ "$ID" != rocky ] && [ "$ID" != almalinux ]; then
-        printf "${WARNING_COLOR}%s%s\n${ENDC}" "For Red Hat family distros, the Wally install script has only been tested on RHEL, Rocky Linux," \
+        printf "${WARNING_COLOR}%s%s\n${ENDC}" "For Red Hat family distros, the Wally installation script has only been tested on RHEL, Rocky Linux," \
             " and AlmaLinux. Your distro is $PRETTY_NAME. The regular Red Hat install will be attempted, but there may be issues."
     fi
     export RHEL_VERSION="${VERSION_ID:0:1}"
     if (( RHEL_VERSION < 8 )); then
-        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script is only compatible with versions 8 and 9 of RHEL, Rocky Linux, and AlmaLinux. You have version $VERSION."
+        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally installation script is only compatible with versions 8 and 9 of RHEL, Rocky Linux, and AlmaLinux. You have version $VERSION."
         exit 1
     fi
 elif [[ "$ID" == ubuntu || "$ID_LIKE" == *ubuntu* ]]; then
     export FAMILY=ubuntu
     if [ "$ID" != ubuntu ]; then
-        printf "${WARNING_COLOR}%s\n${ENDC}" "For Ubuntu family distros, the Wally install script has only been tested on standard Ubuntu. Your distro " \
+        printf "${WARNING_COLOR}%s%s\n${ENDC}" "For Ubuntu family distros, the Wally installation script has only been tested on standard Ubuntu. Your distro " \
             "is $PRETTY_NAME. The regular Ubuntu install will be attempted, but there may be issues."
     fi
     export UBUNTU_VERSION="${VERSION_ID:0:2}"
     if (( UBUNTU_VERSION < 20 )); then
-        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script has only been tested with Ubuntu versions 20.04 LTS, 22.04 LTS, and 24.04 LTS. You have version $VERSION."
+        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally installation script has only been tested with Ubuntu versions 20.04 LTS, 22.04 LTS, and 24.04 LTS. You have version $VERSION."
         exit 1
     fi
 elif [[ "$ID" == debian || "$ID_LIKE" == *debian* ]]; then
     export FAMILY=debian
     if [ "$ID" != debian ]; then
-        printf "${WARNING_COLOR}%s\n${ENDC}" "For Debian family distros, the Wally install script has only been tested on standard Debian (and Ubuntu). Your distro " \
+        printf "${WARNING_COLOR}%s%s\n${ENDC}" "For Debian family distros, the Wally installation script has only been tested on standard Debian (and Ubuntu). Your distro " \
             "is $PRETTY_NAME. The regular Debian install will be attempted, but there may be issues."
     fi
     export DEBIAN_VERSION="$VERSION_ID"
     if (( DEBIAN_VERSION < 11 )); then
-        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script has only been tested with Debian versions 11 and 12. You have version $VERSION."
+        printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally installation script has only been tested with Debian versions 11 and 12. You have version $VERSION."
         exit 1
     fi
 else
-    printf "${FAIL_COLOR}%s%s%s\n${ENDC}" "The Wally install script is currently only compatible with Ubuntu, Debian, and Red Hat family " \
+    printf "${FAIL_COLOR}%s%s%s\n${ENDC}" "The Wally installation script is currently only compatible with Ubuntu, Debian, and Red Hat family " \
         "(RHEL, Rocky Linux, or AlmaLinux) distros. Your detected distro is $PRETTY_NAME. You may try manually running the " \
         "commands in this script, but it is likely that some will need to be altered."
     exit 1

From 7be6311f51807104317d81705603a4f21de2c826 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 25 Nov 2024 08:11:50 -0800
Subject: [PATCH 16/25] Update cvw-arch-verif submodule

---
 addins/cvw-arch-verif | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addins/cvw-arch-verif b/addins/cvw-arch-verif
index 6d658b7b4..812f30af7 160000
--- a/addins/cvw-arch-verif
+++ b/addins/cvw-arch-verif
@@ -1 +1 @@
-Subproject commit 6d658b7b42c83fd584008d72964cc75d0876b769
+Subproject commit 812f30af765c0a692c506e42493f494278c00fe0

From 55fb7e07b3dca67557d6131c62eeae87cc8c5163 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 25 Nov 2024 08:12:52 -0800
Subject: [PATCH 17/25] Add cvw-arch-verif to main Makefile

---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 323b18b1d..52513a812 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,9 @@ MAKEFLAGS += --output-sync --no-print-directory
 
 SIM = ${WALLY}/sim
 
-.PHONY: all riscof testfloat combined_IF_vectors zsbl benchmarks coremark embench coverage clean
+.PHONY: all riscof testfloat combined_IF_vectors zsbl benchmarks coremark embench coverage cvw-arch-verif clean
 
-all: riscof	testfloat combined_IF_vectors zsbl coverage # benchmarks
+all: riscof	testfloat combined_IF_vectors zsbl coverage cvw-arch-verif # benchmarks
 
 # riscof builds the riscv-arch-test and wally-riscv-arch-test suites
 riscof:
@@ -36,6 +36,10 @@ embench:
 coverage:
 	$(MAKE) -C tests/coverage
 
+cvw-arch-verif:
+	$(MAKE) -C ${WALLY}/addins/cvw-arch-verif
+
 clean:
 	$(MAKE) clean -C sim
 	$(MAKE) clean -C ${WALLY}/tests/fp
+	$(MAKE) clean -C ${WALLY}/addins/cvw-arch-verif

From 53fe1c2598ff186c3b413ea0e0343807f4ac9118 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sun, 17 Nov 2024 00:00:40 -0800
Subject: [PATCH 18/25] Add dependabot file

---
 .github/dependabot.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..a91ebaf1d
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  # Update git submodules to latest version
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  # Update actions in the GitHub Actions workflow files
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

From aa72ed1c19d49db60420322857884416ffc6073e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 16:36:14 +0000
Subject: [PATCH 19/25] Bump addins/verilog-ethernet from `c180b22` to
 `6f5ea41`

Bumps [addins/verilog-ethernet](https://github.com/rosethompson/verilog-ethernet) from `c180b22` to `6f5ea41`.
- [Commits](https://github.com/rosethompson/verilog-ethernet/compare/c180b22ed5f4112d0ef35b2c5ac1acc45f9ebb5d...6f5ea41584c49543e63415e37356ebb24b07d89d)

---
updated-dependencies:
- dependency-name: addins/verilog-ethernet
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 addins/verilog-ethernet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addins/verilog-ethernet b/addins/verilog-ethernet
index c180b22ed..6f5ea4158 160000
--- a/addins/verilog-ethernet
+++ b/addins/verilog-ethernet
@@ -1 +1 @@
-Subproject commit c180b22ed5f4112d0ef35b2c5ac1acc45f9ebb5d
+Subproject commit 6f5ea41584c49543e63415e37356ebb24b07d89d

From 7d80a8992a535710eed2702106ce8359b5a45aa0 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 25 Nov 2024 08:55:46 -0800
Subject: [PATCH 20/25] Remove FreeRTOS

---
 .gitmodules            | 3 ---
 addins/FreeRTOS-Kernel | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 addins/FreeRTOS-Kernel

diff --git a/.gitmodules b/.gitmodules
index 34a374174..5a1e8d4dc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,9 +8,6 @@
 [submodule "addins/coremark"]
 	path = addins/coremark
 	url = https://github.com/eembc/coremark
-[submodule "addins/FreeRTOS-Kernel"]
-	path = addins/FreeRTOS-Kernel
-	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
 [submodule "addins/vivado-boards"]
 	path = addins/vivado-boards
 	url = https://github.com/Digilent/vivado-boards/
diff --git a/addins/FreeRTOS-Kernel b/addins/FreeRTOS-Kernel
deleted file mode 160000
index 17a46c252..000000000
--- a/addins/FreeRTOS-Kernel
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 17a46c252f2f237e03a6768c5d15731215322f31

From 015b3f0d680f94a93720abf2434962d6b87c49d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 16:59:13 +0000
Subject: [PATCH 21/25] Bump addins/vivado-boards from `e5f0728` to `8ed4f99`

Bumps [addins/vivado-boards](https://github.com/Digilent/vivado-boards) from `e5f0728` to `8ed4f99`.
- [Commits](https://github.com/Digilent/vivado-boards/compare/e5f0728cd284d10080ae8eb03fc86e7b5eafcb72...8ed4f9981da1d80badb0b1f65e250b2dbf7a564d)

---
updated-dependencies:
- dependency-name: addins/vivado-boards
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 addins/vivado-boards | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addins/vivado-boards b/addins/vivado-boards
index e5f0728cd..8ed4f9981 160000
--- a/addins/vivado-boards
+++ b/addins/vivado-boards
@@ -1 +1 @@
-Subproject commit e5f0728cd284d10080ae8eb03fc86e7b5eafcb72
+Subproject commit 8ed4f9981da1d80badb0b1f65e250b2dbf7a564d

From 7358c1fe67208bbd3e2284b6ebcc01e1020afd34 Mon Sep 17 00:00:00 2001
From: Rose Thompson <rose@rosethompson.net>
Date: Mon, 25 Nov 2024 15:50:29 -0600
Subject: [PATCH 22/25] Fixed sublte bug in the spi_fifo which allows for
 spurious write to fifo.  Fixed fpga zsbl so that is uses read fifo interrupt
 pending (IP) rather than transmit fifo IP.  Resolves issue with stalled load
 reading the wrong fifo status.

---
 fpga/zsbl/spi.c        | 2 +-
 fpga/zsbl/spi.h        | 2 +-
 src/uncore/spi_fifo.sv | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fpga/zsbl/spi.c b/fpga/zsbl/spi.c
index 04d609648..4e75086ad 100644
--- a/fpga/zsbl/spi.c
+++ b/fpga/zsbl/spi.c
@@ -31,7 +31,7 @@
 
 uint8_t spi_txrx(uint8_t byte) {
   spi_sendbyte(byte);
-  waittx();
+  waitrx();
   return spi_readbyte();
 }
 
diff --git a/fpga/zsbl/spi.h b/fpga/zsbl/spi.h
index f9e88fa6d..5a472142f 100644
--- a/fpga/zsbl/spi.h
+++ b/fpga/zsbl/spi.h
@@ -106,7 +106,7 @@ static inline void waittx() {
 }
 
 static inline void waitrx() {
-  while(read_reg(SPI_IP) & 2) {}
+  while(!(read_reg(SPI_IP) & 2)) {}
 }
 
 static inline uint8_t spi_readbyte() {
diff --git a/src/uncore/spi_fifo.sv b/src/uncore/spi_fifo.sv
index 1e4910faf..514e9df7b 100644
--- a/src/uncore/spi_fifo.sv
+++ b/src/uncore/spi_fifo.sv
@@ -26,7 +26,7 @@ module spi_fifo #(parameter M=3, N=8)(                 // 2^M entries of N bits
  
     assign rdata = mem[raddr];
     always_ff @(posedge PCLK)
-        if (winc & ~wfull) mem[waddr] <= wdata;
+        if (winc & wen & ~wfull) mem[waddr] <= wdata;
 
     // write and read are enabled 
     always_ff @(posedge PCLK)

From 58628ed37001437f36e238cfefc2913f901ef5f1 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 25 Nov 2024 15:43:11 -0800
Subject: [PATCH 23/25] Remove riscvISACOV submodule

---
 .gitmodules        | 3 ---
 addins/riscvISACOV | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 addins/riscvISACOV

diff --git a/.gitmodules b/.gitmodules
index 5a1e8d4dc..672ec445f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,9 +26,6 @@
 	path = addins/cvw-arch-verif
 	url = https://github.com/openhwgroup/cvw-arch-verif
 	ignore = dirty
-[submodule "addins/riscvISACOV"]
-	path = addins/riscvISACOV
-	url = https://github.com/riscv-verification/riscvISACOV.git
 [submodule "addins/berkeley-softfloat-3"]
 	path = addins/berkeley-softfloat-3
 	url = https://github.com/ucb-bar/berkeley-softfloat-3.git
diff --git a/addins/riscvISACOV b/addins/riscvISACOV
deleted file mode 160000
index ac9fa2d38..000000000
--- a/addins/riscvISACOV
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ac9fa2d386c0cb2f44e1e1e83a555d585034dfa3

From 6e1d2efc002457e6a361c2efc16f024cad92fd9b Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 25 Nov 2024 20:29:55 -0800
Subject: [PATCH 24/25] Update wally.do to use new isacov location

---
 sim/questa/wally.do | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index 6f613c404..f42bf4930 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -110,9 +110,8 @@ if {[lcheck lst "--fcov"]} {
          set FCvlog "+define+INCLUDE_TRACE2COV \
                 +define+IDV_INCLUDE_TRACE2COV \
                 +define+COVER_BASE_RV32I \
-                +incdir+$env(WALLY)/addins/riscvISACOV/source \
+                +incdir+$env(WALLY)/addins/cvw-arch-verif/riscvISACOV/source \
 		"
-   
     set FCvopt "+TRACE2COV_ENABLE=1 +IDV_TRACE2COV=1"
 
 }

From 6b792f876038fabc159368555d1c28300a12e932 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Mon, 25 Nov 2024 20:33:36 -0800
Subject: [PATCH 25/25] Update cvw-arch-verif to version with isacov

---
 addins/cvw-arch-verif | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addins/cvw-arch-verif b/addins/cvw-arch-verif
index 812f30af7..d6bae481c 160000
--- a/addins/cvw-arch-verif
+++ b/addins/cvw-arch-verif
@@ -1 +1 @@
-Subproject commit 812f30af765c0a692c506e42493f494278c00fe0
+Subproject commit d6bae481c784461a2d2be14325041ea284319098