From: Florent Kermarrec Date: Tue, 19 May 2020 11:59:56 +0000 (+0200) Subject: integration/builder: simplify default output_dir to "build/platform". X-Git-Tag: 24jan2021_ls180~326 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=109fd2674a65a236dc93486994b6d236f2b6dbf4;p=litex.git integration/builder: simplify default output_dir to "build/platform". All SoC are now based on the same base class and naming was too complicated. --- diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py index 496903eb..469f2110 100644 --- a/litex/soc/integration/builder.py +++ b/litex/soc/integration/builder.py @@ -55,9 +55,8 @@ class Builder: bios_options = None): self.soc = soc - # From Python doc: makedirs() will become confused if the path - # elements to create include '..' - self.output_dir = os.path.abspath(output_dir or "soc_{}_{}".format(soc.__class__.__name__.lower(), soc.platform.name)) + # From Python doc: makedirs() will become confused if the path elements to create include '..' + self.output_dir = os.path.abspath(output_dir or os.path.join("build", soc.platform.name)) self.gateware_dir = os.path.abspath(gateware_dir or os.path.join(self.output_dir, "gateware")) self.software_dir = os.path.abspath(software_dir or os.path.join(self.output_dir, "software")) self.include_dir = os.path.abspath(include_dir or os.path.join(self.software_dir, "include"))