aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
Diffstat (limited to 'host')
-rwxr-xr-xhost/python/uhd/imgbuilder/image_builder.py2
-rwxr-xr-xhost/utils/rfnoc_image_builder.py6
2 files changed, 8 insertions, 0 deletions
diff --git a/host/python/uhd/imgbuilder/image_builder.py b/host/python/uhd/imgbuilder/image_builder.py
index 9ce57d0e0..159c075a7 100755
--- a/host/python/uhd/imgbuilder/image_builder.py
+++ b/host/python/uhd/imgbuilder/image_builder.py
@@ -780,6 +780,8 @@ def build(fpga_path, device, image_core_path, edge_file, **args):
logging.debug("Temporarily changing working directory to %s", build_dir)
os.chdir(build_dir)
make_cmd = ". ./setupenv.sh "
+ if "vivado_path" in args and args["vivado_path"]:
+ make_cmd = make_cmd + "--vivado-path=" + args["vivado_path"] + " "
if "clean_all" in args and args["clean_all"]:
make_cmd = make_cmd + "&& make cleanall "
target = args["target"] if "target" in args else ""
diff --git a/host/utils/rfnoc_image_builder.py b/host/utils/rfnoc_image_builder.py
index 07419cb90..64317aec4 100755
--- a/host/utils/rfnoc_image_builder.py
+++ b/host/utils/rfnoc_image_builder.py
@@ -100,6 +100,11 @@ def setup_parser():
"-c", "--clean-all",
help="Cleans the IP before a new build",
action="store_true")
+ parser.add_argument(
+ "-p", "--vivado-path",
+ help="Path to the base install for Xilinx Vivado if not in default "
+ "location (e.g., /tools/Xilinx/Vivado).",
+ default=None)
return parser
@@ -216,6 +221,7 @@ def main():
output_path=args.image_core_output,
router_hex_path=args.router_hex_output,
include_paths=args.include_dir,
+ vivado_path=args.vivado_path,
)
if __name__ == "__main__":