cpu/lm32: re-enable multiplier/divider in minimal variant (does not seem to work...

diff --git a/litex/soc/cores/cpu/lm32/verilog/config_minimal/lm32_config.v b/litex/soc/cores/cpu/lm32/verilog/config_minimal/lm32_config.v
index 83d9d97f4996b2851ceb7522467696e6781f6e25..b9620d6c9cc16ad2537a28dd409f48dee1be4fb1 100644 (file)
--- a/litex/soc/cores/cpu/lm32/verilog/config_minimal/lm32_config.v
+++ b/litex/soc/cores/cpu/lm32/verilog/config_minimal/lm32_config.v
@@ -39,13 +39,13 @@
 // in a pipelined one. The multi-cycle multiplier stalls the pipe
 // for 32 cycles. If both options are disabled, multiply operations
 // are not supported.
-//`define CFG_MC_MULTIPLY_ENABLED
+`define CFG_MC_MULTIPLY_ENABLED
 //`define CFG_PL_MULTIPLY_ENABLED
 
 // Enable the multi-cycle divider. Stalls the pipe until the result
 // is ready after 32 cycles. If disabled, the divide operation is not
 // supported.
-//`define CFG_MC_DIVIDE_ENABLED
+`define CFG_MC_DIVIDE_ENABLED
 
 
 //

diff --git a/litex/soc/integration/cpu_interface.py b/litex/soc/integration/cpu_interface.py
index 6ac138117c717ef94daa430f1e47616d0396be9e..fb956070640160105128f027ca47044d21c42aa4 100644 (file)
--- a/litex/soc/integration/cpu_interface.py
+++ b/litex/soc/integration/cpu_interface.py
@@ -24,10 +24,7 @@ def get_cpu_mak(cpu, variant):
     if cpu == "lm32":
         assert not clang, "lm32 not supported with clang."
         triple = "lm32-elf"
-        if variant == "minimal":
-            cpuflags = "-mbarrel-shift-enabled -msign-extend-enabled"
-        else:
-            cpuflags = "-mbarrel-shift-enabled -mmultiply-enabled -mdivide-enabled -msign-extend-enabled"
+        cpuflags = "-mbarrel-shift-enabled -mmultiply-enabled -mdivide-enabled -msign-extend-enabled"
         clang = False
     elif cpu == "or1k":
         # Default to CLANG unless told otherwise