From 1d6ce66bf77219c2fb66daf270e9afa064a32f83 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Wed, 12 Feb 2020 16:43:11 +0100 Subject: [PATCH] soc/integration/builder: update copyright, align arguments --- litex/soc/integration/builder.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py index 4c8df1aa..a5963973 100644 --- a/litex/soc/integration/builder.py +++ b/litex/soc/integration/builder.py @@ -5,6 +5,7 @@ # This file is Copyright (c) 2018 Sergiusz Bazanski # This file is Copyright (c) 2016-2017 Tim 'mithro' Ansell # This file is Copyright (c) 2018 William D. Jones +# This file is Copyright (c) 2020 Xiretza # License: BSD @@ -37,23 +38,25 @@ def _makefile_escape(s): class Builder: def __init__(self, soc, - output_dir=None, - gateware_dir=None, - software_dir=None, - include_dir=None, - generated_dir=None, - compile_software=True, compile_gateware=True, - gateware_toolchain_path=None, - csr_json=None, csr_csv=None): + output_dir = None, + gateware_dir = None, + software_dir = None, + include_dir = None, + generated_dir = None, + compile_software = True, + compile_gateware = True, + gateware_toolchain_path = None, + csr_json = None, + csr_csv = 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)) - 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")) - self.generated_dir = os.path.abspath(generated_dir or os.path.join(self.include_dir, "generated")) + self.output_dir = os.path.abspath(output_dir or "soc_{}_{}".format(soc.__class__.__name__.lower(), 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")) + self.generated_dir = os.path.abspath(generated_dir or os.path.join(self.include_dir, "generated")) self.compile_software = compile_software self.compile_gateware = compile_gateware -- 2.30.2