Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build/parser: Fix CPU listing when invalid one is provided and simplify.

This commit is contained in:
Florent Kermarrec 2022-11-07 13:34:09 +01:00
parent 1ce3271efe
commit 3c52d440a6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
litex/build/parser.py
View File

@ -2,6 +2,7 @@
# This file is part of LiteX. # This file is part of LiteX.
# #
# This file is Copyright (c) 2022 Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> # This file is Copyright (c) 2022 Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
# This file is Copyright (c) 2022 Florent Kermarrec <florent@enjoy-digital.fr>
# SPDX-License-Identifier: BSD-2-Clause # SPDX-License-Identifier: BSD-2-Clause
import argparse import argparse
@ -161,12 +162,11 @@ class LiteXArgumentParser(argparse.ArgumentParser):
self._platform.fill_args(self._toolchain, self) self._platform.fill_args(self._toolchain, self)
# Intercept selected CPU to fill arguments. # Intercept selected CPU to fill arguments.
cpu_cls = None cpu_cls = cpu.CPUS.get(self.get_value_from_key("--cpu-type"), None)
cpu_name = self.get_value_from_key("--cpu-type") if cpu_cls is not None and hasattr(cpu_cls, "args_fill"):
if cpu_name is not None: cpu_cls.args_fill(self)
cpu_cls = cpu.CPUS[cpu_name]
if cpu_cls is not None and hasattr(cpu_cls, "args_fill"): # Parse args.
cpu_cls.args_fill(self)
self._args = argparse.ArgumentParser.parse_args(self, args, namespace) self._args = argparse.ArgumentParser.parse_args(self, args, namespace)
# Re-inject CPU read arguments. # Re-inject CPU read arguments.