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 1ad399915a263aea08a64fd1d9d2276c6d244fe5..4b80dfc7c79c31062cbdba31356d7b990ff85706 100644 (file)
--- 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 f4e7d38f5137b1fe4cdde4db5baeae7bd4bb2fa4..f89ad63b5811d8d3fe9e45fe05af9b2809d1c93d 100644 (file)
--- 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 e4b2a80dae81fa1bb456727f3977de5b8844d75b..26ec67b8ccdeefe1aec8e90f3129b9517c6e78d1 100644 (file)
--- 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 d78581c16d46b4365203a74279dba3716d8d0da6..6bf7ee0ccdc48193e32a3196af62d8589a639845 100644 (file)
--- 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 25b2a592aa29eb82099761998038d00575614c7c..05dff90b4a53647315e158bd7de5dc7c0ede3133 100644 (file)
--- 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.