From a426ec9e2fa4fb982bfd3f4fe9496a70e10084b4 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Fri, 20 May 2022 18:51:43 +0200 Subject: [PATCH] cpu/vexriscv_smp/core: Only use Linux variant (Since similar to standard). --- litex/soc/cores/cpu/vexriscv_smp/core.py | 13 +++---------- litex/tools/litex_json2dts_linux.py | 6 +++--- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/litex/soc/cores/cpu/vexriscv_smp/core.py b/litex/soc/cores/cpu/vexriscv_smp/core.py index 602224622..8cde1678e 100755 --- a/litex/soc/cores/cpu/vexriscv_smp/core.py +++ b/litex/soc/cores/cpu/vexriscv_smp/core.py @@ -20,13 +20,6 @@ import os class Open(Signal): pass -# Variants ----------------------------------------------------------------------------------------- - -CPU_VARIANTS = { - "standard": "VexRiscv", - "linux": "VexRiscv", # Similar to standard. -} - # VexRiscv SMP ------------------------------------------------------------------------------------- class VexRiscvSMP(CPU): @@ -34,7 +27,7 @@ class VexRiscvSMP(CPU): family = "riscv" name = "vexriscv" human_name = "VexRiscv SMP" - variants = CPU_VARIANTS + variants = ["standard", "linux"] data_width = 32 endianness = "little" gcc_triple = CPU_GCC_TRIPLE_RISCV32 @@ -271,8 +264,8 @@ class VexRiscvSMP(CPU): def __init__(self, platform, variant): self.platform = platform - self.variant = "standard" - self.human_name = self.human_name + "-" + variant.upper() + self.variant = "linux" + self.human_name = self.human_name + "-" + self.variant.upper() self.reset = Signal() self.jtag_clk = Signal() self.jtag_enable = Signal() diff --git a/litex/tools/litex_json2dts_linux.py b/litex/tools/litex_json2dts_linux.py index 33b713450..41f1849b4 100755 --- a/litex/tools/litex_json2dts_linux.py +++ b/litex/tools/litex_json2dts_linux.py @@ -33,9 +33,9 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic # Boot Arguments ------------------------------------------------------------------------------- cpu_architectures = { - "mor1kx": "or1k", - "marocchino": "or1k", - "vexriscv smp-linux": "riscv", + "mor1kx" : "or1k", + "marocchino" : "or1k", + "vexriscv smp-linux" : "riscv", } default_initrd_start = { "or1k": 8*mB,