From 79cc3698b81ac96183c49d09a185d0b2a888453e Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Sat, 29 Oct 2022 09:12:51 +0200 Subject: [PATCH] build/generic_toolchain, build/lattice/icestorm: tool_options is now a dict {key, value} (with value can be a dict) => edaflow compat --- litex/build/generic_toolchain.py | 2 +- litex/build/lattice/icestorm.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/litex/build/generic_toolchain.py b/litex/build/generic_toolchain.py index 2728bc333..f7b832ad8 100644 --- a/litex/build/generic_toolchain.py +++ b/litex/build/generic_toolchain.py @@ -144,7 +144,7 @@ class GenericToolchain: edam = { 'name' : self._build_name, 'files' : files, - 'tool_options' : {tool: tool_options}, + **tool_options, 'toplevel' : self._build_name, } diff --git a/litex/build/lattice/icestorm.py b/litex/build/lattice/icestorm.py index c1a676137..50a7df4ea 100644 --- a/litex/build/lattice/icestorm.py +++ b/litex/build/lattice/icestorm.py @@ -102,7 +102,7 @@ class LatticeIceStormToolchain(YosysNextPNRToolchain): "yosys_synth_options": self._synth_opts.split(' '), "nextpnr_options": self._pnr_opts.split(' '), } - return ("icestorm", tool_options) + return ("icestorm", {"tool_options": {"icestorm": tool_options}}) def icestorm_args(parser):