From ba142121292fb88a994b7cf535c7bb6a346ebe85 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Thu, 20 Jan 2022 08:49:58 +0100
Subject: [PATCH] cores/cpu: Avoid duplication between
 CPU_GCC_TRIPLE_RISCV64/CPU_GCC_TRIPLE_RISCV32, CPU_GCC_TRIPLE_RISCV32 is just
 an extension of CPU_GCC_TRIPLE_RISCV64.

---
 litex/soc/cores/cpu/__init__.py | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/litex/soc/cores/cpu/__init__.py b/litex/soc/cores/cpu/__init__.py
index 76f64a8cb..58bf5013b 100644
--- a/litex/soc/cores/cpu/__init__.py
+++ b/litex/soc/cores/cpu/__init__.py
@@ -47,21 +47,6 @@ class CPUNone(CPU):
         "spiflash" : 0x10000000, # FIXME: Remove.
     }
 
-CPU_GCC_TRIPLE_RISCV32 = (
-    "riscv64-unknown-elf",
-    "riscv64-unknown-linux-gnu",
-    "riscv32-unknown-elf",
-    "riscv32-unknown-linux-gnu",
-    "riscv64-elf",
-    "riscv32-elf",
-    "riscv-none-embed",
-    "riscv-none-elf",
-    "riscv64-linux",
-    "riscv64-linux-gnu",
-    "riscv-sifive-elf",
-    "riscv64-none-elf",
-)
-
 CPU_GCC_TRIPLE_RISCV64 = (
     "riscv64-unknown-elf",
     "riscv64-unknown-linux-gnu",
@@ -72,6 +57,14 @@ CPU_GCC_TRIPLE_RISCV64 = (
     "riscv64-none-elf",
 )
 
+CPU_GCC_TRIPLE_RISCV32 = CPU_GCC_TRIPLE_RISCV64 + (
+    "riscv32-unknown-elf",
+    "riscv32-unknown-linux-gnu",
+    "riscv32-elf",
+    "riscv-none-embed",
+    "riscv-none-elf",
+)
+
 # CPUS ---------------------------------------------------------------------------------------------
 
 def collect_cpus():