From: enjoy-digital <florent@enjoy-digital.fr>
Date: Mon, 11 May 2020 06:58:20 +0000 (+0200)
Subject: Merge branch 'master' into cpu-imac-config-for-vexriscv
X-Git-Tag: 24jan2021_ls180~365^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5f74a5aa721a53fe8f1311bbb5379dd3bd7a9ee;p=litex.git

Merge branch 'master' into cpu-imac-config-for-vexriscv
---

c5f74a5aa721a53fe8f1311bbb5379dd3bd7a9ee
diff --cc litex/soc/cores/cpu/__init__.py
index 5497bac8,bc106712..4c273e50
--- a/litex/soc/cores/cpu/__init__.py
+++ b/litex/soc/cores/cpu/__init__.py
@@@ -58,14 -85,13 +85,14 @@@ CPUS = 
  
  CPU_VARIANTS = {
      # "official name": ["alias 1", "alias 2"],
-     "minimal" : ["min",],
-     "lite" : ["light", "zephyr", "nuttx"],
-     "standard": [None, "std"],
-     "imac": [],
-     "full": [],
-     "linux" : [],
-     "linuxd" : [],
-     "linuxq" : [],
+     "minimal" :   ["min",],
+     "lite" :      ["light", "zephyr", "nuttx"],
+     "standard":   [None, "std"],
++    "imac":       [],
+     "full":       [],
+     "linux" :     [],
+     "linuxd" :    [],
+     "linuxq" :    [],
  }
  CPU_VARIANTS_EXTENSIONS = ["debug", "no-dsp"]