From ed6a6a83a972442f82dbc23d8d1c6cc266bb5f36 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Mon, 4 Apr 2022 15:39:05 +0200 Subject: [PATCH] litex_setup: Switch to manual install for Amaranth/Minerva (No longer supporting Python 3.6). We could revert when upgrading LiteX python requirement. --- litex_setup.py | 2 -- test/test_cpu.py | 4 ---- 2 files changed, 6 deletions(-) diff --git a/litex_setup.py b/litex_setup.py index 71ad35a76..c660d7e0c 100755 --- a/litex_setup.py +++ b/litex_setup.py @@ -68,7 +68,6 @@ class GitRepo: git_repos = { # HDL. "migen": GitRepo(url="https://github.com/m-labs/", clone="recursive"), - "amaranth": GitRepo(url="https://github.com/amaranth-lang/", branch="main"), # LiteX SoC builder "pythondata-software-picolibc": GitRepo(url="https://github.com/litex-hub/", clone="recursive"), @@ -116,7 +115,6 @@ minimal_repos = ["migen", "litex"] # Standard: Migen + LiteX + Cores + Software + Popular CPUs (LM32, Mor1kx, SERV, VexRiscv). standard_repos = list(git_repos.keys()) -standard_repos.remove("amaranth") standard_repos.remove("pythondata-cpu-picorv32") standard_repos.remove("pythondata-cpu-rocket") standard_repos.remove("pythondata-cpu-minerva") diff --git a/test/test_cpu.py b/test/test_cpu.py index 6200fbde2..02047107b 100644 --- a/test/test_cpu.py +++ b/test/test_cpu.py @@ -56,10 +56,6 @@ class TestCPU(unittest.TestCase): def test_picorv32(self): self.assertTrue(self.boot_test("picorv32")) - # FIXME: Wait for Aramanth/Minerva to stabilize. - #def test_minerva(self): - # self.assertTrue(self.boot_test("minerva")) - # OpenRISC CPUs. #def test_mor1kx(self): # self.assertTrue(self.boot_test("mor1kx"))