[pwrmgr,ipgen] Fix top_englishbreakfast build

Signed-off-by: Guillermo Maturana <[email protected]>
lowRISC · Oct 5, 2023 · 43678a6 · 43678a6
1 parent 9806d30
commit 43678a6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/hw/top_englishbreakfast/data/top_englishbreakfast.hjson b/hw/top_englishbreakfast/data/top_englishbreakfast.hjson
@@ -244,8 +244,7 @@
       },
       domain: ["Aon"],
       base_addr: "0x40400000",
-      attr: "templated",
-
+      attr: "ipgen",
     },
     { name: "rstmgr_aon",
       type: "rstmgr",

diff --git a/hw/top_englishbreakfast/util/prepare_sw.py b/hw/top_englishbreakfast/util/prepare_sw.py
@@ -144,7 +144,7 @@ def main():
         'ip_autogen/alert_handler/data/alert_handler.hjson',
         'ip/clkmgr/data/autogen/clkmgr.hjson',
         'ip/flash_ctrl/data/autogen/flash_ctrl.hjson',
-        'ip/pwrmgr/data/autogen/pwrmgr.hjson',
+        'ip_autogen/pwrmgr/data/pwrmgr.hjson',
         'ip/rstmgr/data/autogen/rstmgr.hjson',
         'ip/pinmux/data/autogen/pinmux.hjson',
         'ip_autogen/rv_plic/data/rv_plic.hjson',

diff --git a/topgen-reg-only.core b/topgen-reg-only.core
@@ -11,7 +11,6 @@ filesets:
       - lowrisc:ip:clkmgr_reggen
       - lowrisc:ip:flash_ctrl_reggen
       - lowrisc:ip:pinmux_reggen
-      - lowrisc:ip:pwrmgr_reggen
       - lowrisc:ip:rstmgr_reggen
 
 targets:

diff --git a/util/topgen-fusesoc.py b/util/topgen-fusesoc.py
@@ -75,12 +75,11 @@ def main():
         'clkmgr': '',
         'flash_ctrl': '_core',
         'pinmux': '',
-        'pwrmgr': '',
         'rstmgr': '',
     }
 
     # reg-only
-    for ip in ['clkmgr', 'flash_ctrl', 'pinmux', 'pwrmgr', 'rstmgr']:
+    for ip in ['clkmgr', 'flash_ctrl', 'pinmux', 'rstmgr']:
         core_filepath = os.path.abspath(os.path.join(files_out, 'generated-%s.core' % ip))
         name = 'lowrisc:ip:%s_reggen' % ip,
         files = ['ip/%s/rtl/autogen/%s_reg_pkg.sv' % (ip, ip),