Remove features deprecated in past releases.
This commit is contained in:
		
							parent
							
								
									5e2f3b7992
								
							
						
					
					
						commit
						15b6068c57
					
				|  | @ -73,14 +73,6 @@ class Platform(ResourceManager, metaclass=ABCMeta): | ||||||
|     def _toolchain_env_var(self): |     def _toolchain_env_var(self): | ||||||
|         return f"AMARANTH_ENV_{tool_env_var(self.toolchain)}" |         return f"AMARANTH_ENV_{tool_env_var(self.toolchain)}" | ||||||
| 
 | 
 | ||||||
|     # TODO(amaranth-0.5): remove |  | ||||||
|     @property |  | ||||||
|     def _all_toolchain_env_vars(self): |  | ||||||
|         return ( |  | ||||||
|             f"AMARANTH_ENV_{self.toolchain.replace('-', '_').replace('+', 'X')}", |  | ||||||
|             self._toolchain_env_var, |  | ||||||
|         ) |  | ||||||
| 
 |  | ||||||
|     def build(self, elaboratable, name="top", |     def build(self, elaboratable, name="top", | ||||||
|               build_dir="build", do_build=True, |               build_dir="build", do_build=True, | ||||||
|               program_opts=None, do_program=False, |               program_opts=None, do_program=False, | ||||||
|  |  | ||||||
|  | @ -116,7 +116,7 @@ class BuildPlan: | ||||||
|             else: |             else: | ||||||
|                 subprocess.check_call(["sh", f"{self.script}.sh"], |                 subprocess.check_call(["sh", f"{self.script}.sh"], | ||||||
|                                       cwd=build_dir, env=os.environ if env is None else env) |                                       cwd=build_dir, env=os.environ if env is None else env) | ||||||
|         # TODO(amaranth-0.5): remove |         # TODO(amaranth-0.6): remove | ||||||
|         if run_script is not None: |         if run_script is not None: | ||||||
|             warnings.warn("The `run_script` argument is deprecated. If you only want to " |             warnings.warn("The `run_script` argument is deprecated. If you only want to " | ||||||
|                             "extract the files from the BuildPlan, use the .extract() method", |                             "extract the files from the BuildPlan, use the .extract() method", | ||||||
|  |  | ||||||
|  | @ -135,14 +135,6 @@ class LatticeMachXO2Or3LPlatform(TemplatedPlatform): | ||||||
|             -oft -svfsingle -revd -op "FLASH Erase,Program,Verify" |             -oft -svfsingle -revd -op "FLASH Erase,Program,Verify" | ||||||
|             -if {{name}}_impl/{{name}}_impl.jed -of {{name}}_flash.svf |             -if {{name}}_impl/{{name}}_impl.jed -of {{name}}_flash.svf | ||||||
|         """, |         """, | ||||||
|         # TODO(amaranth-0.4): remove |  | ||||||
|         r""" |  | ||||||
|         {% if syntax == "bat" -%} |  | ||||||
|         copy {{name}}_flash.svf {{name}}.svf |  | ||||||
|         {% else -%} |  | ||||||
|         cp {{name}}_flash.svf {{name}}.svf |  | ||||||
|         {% endif %} |  | ||||||
|         """, |  | ||||||
|         r""" |         r""" | ||||||
|         {{invoke_tool("ddtcmd")}} |         {{invoke_tool("ddtcmd")}} | ||||||
|             -oft -svfsingle -revd -op "SRAM Fast Program" |             -oft -svfsingle -revd -op "SRAM Fast Program" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Catherine
						Catherine