Skip to content

Commit 15b6068

Browse files
committed
Remove features deprecated in past releases.
1 parent 5e2f3b7 commit 15b6068

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

amaranth/build/plat.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,6 @@ def iter_files(self, *suffixes):
7373
def _toolchain_env_var(self):
7474
return f"AMARANTH_ENV_{tool_env_var(self.toolchain)}"
7575

76-
# TODO(amaranth-0.5): remove
77-
@property
78-
def _all_toolchain_env_vars(self):
79-
return (
80-
f"AMARANTH_ENV_{self.toolchain.replace('-', '_').replace('+', 'X')}",
81-
self._toolchain_env_var,
82-
)
83-
8476
def build(self, elaboratable, name="top",
8577
build_dir="build", do_build=True,
8678
program_opts=None, do_program=False,

amaranth/build/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def execute_local(self, root="build", *, run_script=None, env=None):
116116
else:
117117
subprocess.check_call(["sh", f"{self.script}.sh"],
118118
cwd=build_dir, env=os.environ if env is None else env)
119-
# TODO(amaranth-0.5): remove
119+
# TODO(amaranth-0.6): remove
120120
if run_script is not None:
121121
warnings.warn("The `run_script` argument is deprecated. If you only want to "
122122
"extract the files from the BuildPlan, use the .extract() method",

amaranth/vendor/_lattice_machxo_2_3l.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,6 @@ class LatticeMachXO2Or3LPlatform(TemplatedPlatform):
135135
-oft -svfsingle -revd -op "FLASH Erase,Program,Verify"
136136
-if {{name}}_impl/{{name}}_impl.jed -of {{name}}_flash.svf
137137
""",
138-
# TODO(amaranth-0.4): remove
139-
r"""
140-
{% if syntax == "bat" -%}
141-
copy {{name}}_flash.svf {{name}}.svf
142-
{% else -%}
143-
cp {{name}}_flash.svf {{name}}.svf
144-
{% endif %}
145-
""",
146138
r"""
147139
{{invoke_tool("ddtcmd")}}
148140
-oft -svfsingle -revd -op "SRAM Fast Program"

0 commit comments

Comments
 (0)