From f19d993d8b405b9327466005d759e9d1bbddf29b Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Wed, 13 Jul 2022 01:18:42 -0700 Subject: [PATCH] Rework build_images settings Signed-off-by: Alex Forencich --- fpga/build_images.ini | 18 ------------------ fpga/build_images.py | 2 ++ fpga/build_images_project.ini | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 fpga/build_images.ini create mode 100644 fpga/build_images_project.ini diff --git a/fpga/build_images.ini b/fpga/build_images.ini deleted file mode 100644 index 83bb09295..000000000 --- a/fpga/build_images.ini +++ /dev/null @@ -1,18 +0,0 @@ -[general] -prefix = corundum -parallel = 16 -synth_parallel = 8 -dirs = - mqnic - -[vivado] -settings_file = /opt/Xilinx/vivado-settings - -[ise] -settings_file = /opt/Xilinx/ise-settings - -[quartus] -settings_file = /opt/altera/quartus-settings - -[quartus-pro] -settings_file = /opt/altera/quartus-pro-settings diff --git a/fpga/build_images.py b/fpga/build_images.py index 12c4efb44..3be5a1298 100755 --- a/fpga/build_images.py +++ b/fpga/build_images.py @@ -289,6 +289,8 @@ async def monitor_status(jobs): async def main(): config.read("build_images.ini") + config.read("build_images_project.ini") + config.read("build_images_local.ini") parser = argparse.ArgumentParser() parser.add_argument('--output_dir', type=str, default=None, help="Output directory") diff --git a/fpga/build_images_project.ini b/fpga/build_images_project.ini new file mode 100644 index 000000000..1ee0238d5 --- /dev/null +++ b/fpga/build_images_project.ini @@ -0,0 +1,18 @@ +[general] +prefix = corundum +parallel = 16 +synth_parallel = 8 +dirs = + mqnic + +[vivado] +# settings_file = /opt/Xilinx/vivado-settings + +[ise] +# settings_file = /opt/Xilinx/ise-settings + +[quartus] +# settings_file = /opt/altera/quartus-settings + +[quartus-pro] +# settings_file = /opt/altera/quartus-pro-settings