From 7040727012d1cce706dde27deec36f0f90489c3b Mon Sep 17 00:00:00 2001 From: whitequark Date: Sat, 21 Sep 2019 12:23:53 +0000 Subject: [PATCH] =?utf8?q?build.plat:=20NMIGEN=5F=5Fenv?= =?utf8?q?=E2=86=92NMIGEN=5FENV=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is more consistent with other environment variables nMigen uses. --- nmigen/build/plat.py | 2 +- nmigen/vendor/lattice_ecp5.py | 4 ++-- nmigen/vendor/lattice_ice40.py | 2 +- nmigen/vendor/xilinx_7series.py | 2 +- nmigen/vendor/xilinx_spartan_3_6.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nmigen/build/plat.py b/nmigen/build/plat.py index 1ad3999..4b80dfc 100644 --- a/nmigen/build/plat.py +++ b/nmigen/build/plat.py @@ -62,7 +62,7 @@ class Platform(ResourceManager, metaclass=ABCMeta): @property def _toolchain_env_var(self): - return f"NMIGEN_{self.toolchain}_env" + return f"NMIGEN_ENV_{self.toolchain}" def build(self, elaboratable, name="top", build_dir="build", do_build=True, diff --git a/nmigen/vendor/lattice_ecp5.py b/nmigen/vendor/lattice_ecp5.py index f4e7d38..f89ad63 100644 --- a/nmigen/vendor/lattice_ecp5.py +++ b/nmigen/vendor/lattice_ecp5.py @@ -18,7 +18,7 @@ class LatticeECP5Platform(TemplatedPlatform): * ``ecppack`` The environment is populated by running the script specified in the environment variable - ``NMIGEN_Trellis_env``, if present. + ``NMIGEN_ENV_Trellis``, if present. Available overrides: * ``verbose``: enables logging of informational messages to standard error. @@ -46,7 +46,7 @@ class LatticeECP5Platform(TemplatedPlatform): * ``ddtcmd`` The environment is populated by running the script specified in the environment variable - ``NMIGEN_Diamond_env``, if present. + ``NMIGEN_ENV_Diamond``, if present. Available overrides: * ``script_project``: inserts commands before ``prj_project save`` in Tcl script. diff --git a/nmigen/vendor/lattice_ice40.py b/nmigen/vendor/lattice_ice40.py index e4b2a80..26ec67b 100644 --- a/nmigen/vendor/lattice_ice40.py +++ b/nmigen/vendor/lattice_ice40.py @@ -15,7 +15,7 @@ class LatticeICE40Platform(TemplatedPlatform): * ``icepack`` The environment is populated by running the script specified in the environment variable - ``NMIGEN_IceStorm_env``, if present. + ``NMIGEN_ENV_IceStorm``, if present. Available overrides: * ``verbose``: enables logging of informational messages to standard error. diff --git a/nmigen/vendor/xilinx_7series.py b/nmigen/vendor/xilinx_7series.py index d78581c..6bf7ee0 100644 --- a/nmigen/vendor/xilinx_7series.py +++ b/nmigen/vendor/xilinx_7series.py @@ -13,7 +13,7 @@ class Xilinx7SeriesPlatform(TemplatedPlatform): * ``vivado`` The environment is populated by running the script specified in the environment variable - ``NMIGEN_Vivado_env``, if present. + ``NMIGEN_ENV_Vivado``, if present. Available overrides: * ``script_after_read``: inserts commands after ``read_xdc`` in Tcl script. diff --git a/nmigen/vendor/xilinx_spartan_3_6.py b/nmigen/vendor/xilinx_spartan_3_6.py index 25b2a59..05dff90 100644 --- a/nmigen/vendor/xilinx_spartan_3_6.py +++ b/nmigen/vendor/xilinx_spartan_3_6.py @@ -21,7 +21,7 @@ class XilinxSpartan3Or6Platform(TemplatedPlatform): * ``bitgen`` The environment is populated by running the script specified in the environment variable - ``NMIGEN_ISE_env``, if present. + ``NMIGEN_ENV_ISE``, if present. Available overrides: * ``script_after_run``: inserts commands after ``run`` in XST script. -- 2.30.2