From: whitequark <whitequark@whitequark.org>
Date: Sat, 21 Sep 2019 12:23:53 +0000 (+0000)
Subject: build.plat: NMIGEN_<toolchain>_env→NMIGEN_ENV_<toolchain>
X-Git-Tag: v0.1rc1~83
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=07a82ed70e9d3c1efc41db8189409b62343e6081;p=nmigen.git

build.plat: NMIGEN_<toolchain>_env→NMIGEN_ENV_<toolchain>

This is more consistent with other environment variables nMigen uses.
---

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.