From 0a56aff509e06795d7b38c6c97c207a48414f59f Mon Sep 17 00:00:00 2001
From: Guillermo Maturana <maturana@opentitan.org>
Date: Wed, 20 Dec 2023 22:55:21 +0000
Subject: [PATCH] [ipgen,rstmgr] Fix top_englishbreakfast build

Signed-off-by: Guillermo Maturana <maturana@opentitan.org>
---
 hw/top_englishbreakfast/data/top_englishbreakfast.hjson | 2 +-
 hw/top_englishbreakfast/util/prepare_sw.py              | 4 ++--
 topgen-reg-only.core                                    | 1 -
 util/topgen-fusesoc.py                                  | 7 ++-----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/hw/top_englishbreakfast/data/top_englishbreakfast.hjson b/hw/top_englishbreakfast/data/top_englishbreakfast.hjson
index b5aae5dd471a02..769e184d1a2615 100644
--- a/hw/top_englishbreakfast/data/top_englishbreakfast.hjson
+++ b/hw/top_englishbreakfast/data/top_englishbreakfast.hjson
@@ -257,7 +257,7 @@
       param_decl: {
         SecCheck: "0",
       }
-      attr: "templated",
+      attr: "ipgen",
     },
     { name: "clkmgr_aon",
       type: "clkmgr",
diff --git a/hw/top_englishbreakfast/util/prepare_sw.py b/hw/top_englishbreakfast/util/prepare_sw.py
index f5c3451f599a78..9aa47c7201153f 100755
--- a/hw/top_englishbreakfast/util/prepare_sw.py
+++ b/hw/top_englishbreakfast/util/prepare_sw.py
@@ -144,9 +144,9 @@ 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_autogen/pwrmgr/data/pwrmgr.hjson',
-        'ip/rstmgr/data/autogen/rstmgr.hjson',
         'ip/pinmux/data/autogen/pinmux.hjson',
+        'ip_autogen/pwrmgr/data/pwrmgr.hjson',
+        'ip_autogen/rstmgr/data/rstmgr.hjson',
         'ip_autogen/rv_plic/data/rv_plic.hjson',
         'ip/ast/data/ast.hjson',
         'ip/sensor_ctrl/data/sensor_ctrl.hjson',
diff --git a/topgen-reg-only.core b/topgen-reg-only.core
index b9853b19f2be43..d0c80452e3e802 100644
--- 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:rstmgr_reggen
 
 targets:
   default: &default
diff --git a/util/topgen-fusesoc.py b/util/topgen-fusesoc.py
index 61114341d8104e..367b1fe13f1d52 100755
--- a/util/topgen-fusesoc.py
+++ b/util/topgen-fusesoc.py
@@ -75,11 +75,10 @@ def main():
         'clkmgr': '',
         'flash_ctrl': '_core',
         'pinmux': '',
-        'rstmgr': '',
     }
 
     # reg-only
-    for ip in ['clkmgr', 'flash_ctrl', 'pinmux', 'rstmgr']:
+    for ip in ['clkmgr', 'flash_ctrl', 'pinmux']:
         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),
@@ -126,7 +125,7 @@ def main():
                     'lowrisc:prim:util',
                     'lowrisc:ip:lc_ctrl_pkg',
                     'lowrisc:ip:pwrmgr_pkg',
-                    # rstmgr
+                    'lowrisc:ip:rstmgr_pkg',
                     'lowrisc:prim:clock_mux2',
                     # clkmgr
                     'lowrisc:prim:all',
@@ -147,8 +146,6 @@ def main():
                     'ip/flash_ctrl/rtl/autogen/flash_ctrl_pkg.sv',
                     'ip/flash_ctrl/rtl/autogen/flash_ctrl.sv',
                     'ip/flash_ctrl/rtl/autogen/flash_ctrl_region_cfg.sv',
-                    'ip/rstmgr/rtl/autogen/rstmgr_pkg.sv',
-                    'ip/rstmgr/rtl/autogen/rstmgr.sv',
                     # Top
                     'rtl/autogen/%s_rnd_cnst_pkg.sv' % topname,
                     'rtl/autogen/%s_pkg.sv' % topname,