From 798d8b85f7a5865c1578ed15d7c12b7564862c7d Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Tue, 25 Jul 2023 08:22:11 +0200
Subject: [PATCH 1/3] fix CI

---
 .github/workflows/ci.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e459f41d..0213deac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       # Checkout Repository
       - name: Checkout
@@ -13,12 +13,13 @@ jobs:
       # Install Tools
       - name: Install Tools
         run: |
-          sudo apt-get install wget build-essential python3 verilator libevent-dev libjson-c-dev device-tree-compiler
-          pip3 install setuptools
-          pip3 install requests
-          pip3 install pexpect
+          sudo apt update
+          sudo apt install -y wget build-essential python3 python3-pip \
+            verilator libevent-dev libjson-c-dev device-tree-compiler \
+            python3-setuptools python3-requests python3-pexpect \
+            python3-colorama python3-serial python3-packaging python3-yaml \
+            ninja-build
           pip3 install meson
-          pip3 install ninja
 
       # Install (n)Migen / LiteX / Cores
       - name: Install LiteX
@@ -29,13 +30,13 @@ jobs:
       # Install RISC-V GCC
       - name: Install RISC-V GCC
         run: |
-          wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py
-          python3 litex_setup.py gcc
+          wget https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.12/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz
+          tar -xf $PWD/riscv64-*.tar.gz
           sudo mkdir /usr/local/riscv
-          sudo cp -r $PWD/../riscv64-*/* /usr/local/riscv
+          sudo cp -r $PWD/riscv64-*/* /usr/local/riscv
 
       # Test
       - name: Run Tests
         run: |
-          export PATH=/usr/local/riscv/bin:$PATH
+          export PATH=/usr/local/riscv/bin:$HOME/.local/bin:$PATH
           python3 -m unittest test.test_build

From 2a3fdadfeff8313fa28189615d441fbacc9c55c3 Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Tue, 25 Jul 2023 11:51:58 +0000
Subject: [PATCH 2/3] CI: added sbt

---
 .github/workflows/ci.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0213deac..a3fb8e7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,12 +13,21 @@ jobs:
       # Install Tools
       - name: Install Tools
         run: |
+          sudo add-apt-repository -y ppa:openjdk-r/ppa
           sudo apt update
           sudo apt install -y wget build-essential python3 python3-pip \
             verilator libevent-dev libjson-c-dev device-tree-compiler \
             python3-setuptools python3-requests python3-pexpect \
             python3-colorama python3-serial python3-packaging python3-yaml \
-            ninja-build
+            ninja-build curl apt-transport-https gnupg openjdk-8-jdk -y
+          sudo update-alternatives --config java
+          sudo update-alternatives --config javac
+          echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list
+          echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee /etc/apt/sources.list.d/sbt_old.list
+          curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo -H gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/scalasbt-release.gpg --import
+          sudo chmod 644 /etc/apt/trusted.gpg.d/scalasbt-release.gpg
+          sudo apt update
+          sudo apt -y install sbt
           pip3 install meson
 
       # Install (n)Migen / LiteX / Cores

From 814e7f426711978f2220605cef404ec4a9d6fc2f Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Date: Tue, 25 Jul 2023 11:52:30 +0000
Subject: [PATCH 3/3] make.py: fix STLV7325 aliexpress_stlv7325 ->
 sitlinv_stlv7325_v1

---
 make.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make.py b/make.py
index f1a72956..071ac271 100755
--- a/make.py
+++ b/make.py
@@ -363,8 +363,8 @@ def __init__(self):
 
 class STLV7325(Board):
     def __init__(self):
-        from litex_boards.targets import aliexpress_stlv7325
-        Board.__init__(self, aliexpress_stlv7325.BaseSoC, soc_capabilities={
+        from litex_boards.targets import sitlinv_stlv7325_v1
+        Board.__init__(self, sitlinv_stlv7325_v1.BaseSoC, soc_capabilities={
             # Communication
             "serial",
             # Storage