commit 4ffc369061298758f020aaa6cd228f562a8a5ebf
author Pirmin Vogel <vogelpi@lowrisc.org> Wed Nov 25 17:44:47 2020 +0100
committer Pirmin Vogel <vogelpi@lowrisc.org> Thu Dec 03 09:04:32 2020 +0100
tree a2215d356eb484d1883e964bf502baa06d5b2a9b
parent 71bfd9b431cdc1f7750fd4c5db38397c55f7881a

[topgen] Derive IP template paths from script path instead of output path

Deriving the IP template paths from the specified output path only works
if the output path is in the same hierarchy.

Signed-off-by: Pirmin Vogel <vogelpi@lowrisc.org>

util/topgen.py

diff --git a/util/topgen.py b/util/topgen.py
index f91f3b5..9caf436 100755
--- a/util/topgen.py
+++ b/util/topgen.py
@@ -158,7 +158,7 @@
 
     # Generating IP top module script is not generalized yet.
     # So, topgen reads template files from alert_handler directory directly.
-    tpl_path = out_path / '../ip/alert_handler/data'
+    tpl_path = Path(__file__).resolve().parent / '../hw/ip/alert_handler/data'
     hjson_tpl_path = tpl_path / 'alert_handler.hjson.tpl'
     dv_tpl_path = tpl_path / 'alert_handler_env_pkg__params.sv.tpl'
 
@@ -237,7 +237,7 @@
     # Generating IP top module script is not generalized yet.
     # So, topgen reads template files from rv_plic directory directly.
     # Next, if the ip top gen tool is placed in util/ we can import the library.
-    tpl_path = out_path / '../ip/rv_plic/data'
+    tpl_path = Path(__file__).resolve().parent / '../hw/ip/rv_plic/data'
     hjson_tpl_path = tpl_path / 'rv_plic.hjson.tpl'
     rtl_tpl_path = tpl_path / 'rv_plic.sv.tpl'
 
@@ -379,7 +379,7 @@
     data_path.mkdir(parents=True, exist_ok=True)
 
     # Template path
-    tpl_path = out_path / '../ip/pinmux/data/pinmux.hjson.tpl'
+    tpl_path = Path(__file__).resolve().parent / '../hw/ip/pinmux/data/pinmux.hjson.tpl'
 
     # Generate register package and RTLs
     gencmd = ("// util/topgen.py -t hw/top_{topname}/data/top_{topname}.hjson "
@@ -434,7 +434,7 @@
     data_path.mkdir(parents=True, exist_ok=True)
 
     # Template path
-    tpl_path = out_path / '../ip/padctrl/data/padctrl.hjson.tpl'
+    tpl_path = Path(__file__).resolve().parent / '../hw/ip/padctrl/data/padctrl.hjson.tpl'
 
     # Generate register package and RTLs
     gencmd = ("// util/topgen.py -t hw/top_{topname}/data/top_{topname}.hjson "
@@ -596,7 +596,7 @@
     doc_path.mkdir(parents=True, exist_ok=True)
 
     # So, read template files from ip directory.
-    tpl_path = out_path / '../ip/pwrmgr/data'
+    tpl_path = Path(__file__).resolve().parent / '../hw/ip/pwrmgr/data'
     hjson_tpl_path = tpl_path / 'pwrmgr.hjson.tpl'
 
     # Render and write out hjson
@@ -636,7 +636,7 @@
     rtl_path.mkdir(parents=True, exist_ok=True)
     doc_path = out_path / 'ip/rstmgr/data/autogen'
     doc_path.mkdir(parents=True, exist_ok=True)
-    tpl_path = out_path / '../ip/rstmgr/data'
+    tpl_path = Path(__file__).resolve().parent / '../hw/ip/rstmgr/data'
 
     # Read template files from ip directory.
     tpls = []
@@ -725,7 +725,7 @@
     rtl_path.mkdir(parents=True, exist_ok=True)
     doc_path = out_path / 'ip/flash_ctrl/data/autogen'
     doc_path.mkdir(parents=True, exist_ok=True)
-    tpl_path = out_path / '../ip/flash_ctrl/data'
+    tpl_path = Path(__file__).resolve().parent / '../hw/ip/flash_ctrl/data'
 
     # Read template files from ip directory.
     tpls = []