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

diff --cc litex/soc/cores/cpu/__init__.py
index 5497bac853a850717e11eafac1224b271f5eeaea,bc106712394cfdfec35071dee101e68c8d514d71..4c273e50b7b71e71e81a41aeab7af1260c51caf0
--- 1/litex/soc/cores/cpu/__init__.py
--- 2/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"]
  

diff --cc litex/soc/cores/cpu/vexriscv/core.py
Simple merge