From a30606394077cb916f1ce660231eabd3878f9f13 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@rivosinc.com>
Date: Fri, 31 Jan 2025 12:52:51 +0100
Subject: [PATCH] [top] Update core files to reference ipgen'ed rv_core_ibex

Signed-off-by: Robert Schilling <rschilling@rivosinc.com>
---
 hw/top_darjeeling/top_darjeeling.core             | 2 +-
 hw/top_earlgrey/top_earlgrey.core                 | 2 +-
 hw/top_englishbreakfast/top_englishbreakfast.core | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/top_darjeeling/top_darjeeling.core b/hw/top_darjeeling/top_darjeeling.core
index e0deb2a7e5886..900f3e3809385 100644
--- a/hw/top_darjeeling/top_darjeeling.core
+++ b/hw/top_darjeeling/top_darjeeling.core
@@ -13,7 +13,6 @@ filesets:
       - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg
       - lowrisc:ip:uart:0.1
       - lowrisc:ip:gpio
-      - lowrisc:ip:rv_core_ibex
       - lowrisc:ip:rv_dm
       - lowrisc:ip:rv_timer
       - lowrisc:ip:tlul
@@ -48,6 +47,7 @@ filesets:
       - lowrisc:opentitan:top_darjeeling_pwrmgr
       - lowrisc:opentitan:top_darjeeling_rstmgr
       - lowrisc:opentitan:top_darjeeling_rv_plic
+      - lowrisc:opentitan:top_darjeeling_rv_core_ibex
       - lowrisc:ip:aon_timer
       - lowrisc:ip:adc_ctrl
       - lowrisc:ip:sysrst_ctrl
diff --git a/hw/top_earlgrey/top_earlgrey.core b/hw/top_earlgrey/top_earlgrey.core
index 3d4df3b6a481b..f892baa4e4fd6 100644
--- a/hw/top_earlgrey/top_earlgrey.core
+++ b/hw/top_earlgrey/top_earlgrey.core
@@ -13,7 +13,6 @@ filesets:
       - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg
       - lowrisc:ip:uart:0.1
       - lowrisc:ip:gpio
-      - lowrisc:ip:rv_core_ibex
       - lowrisc:ip:rv_dm
       - lowrisc:ip:rv_timer
       - lowrisc:ip:tlul
@@ -48,6 +47,7 @@ filesets:
       - lowrisc:opentitan:top_earlgrey_pwrmgr
       - lowrisc:opentitan:top_earlgrey_rstmgr
       - lowrisc:opentitan:top_earlgrey_rv_plic
+      - lowrisc:opentitan:top_earlgrey_rv_core_ibex
       - lowrisc:ip:aon_timer
       - lowrisc:ip:adc_ctrl
       - lowrisc:ip:sysrst_ctrl
diff --git a/hw/top_englishbreakfast/top_englishbreakfast.core b/hw/top_englishbreakfast/top_englishbreakfast.core
index 0093381a8d80e..301cf0214774a 100644
--- a/hw/top_englishbreakfast/top_englishbreakfast.core
+++ b/hw/top_englishbreakfast/top_englishbreakfast.core
@@ -10,7 +10,6 @@ filesets:
       - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg
       - lowrisc:opentitan:top_earlgrey_alert_handler_pkg
       # Manually instantiated
-      - lowrisc:ip:rv_core_ibex
       - lowrisc:ip:rv_dm
       - lowrisc:ip:tlul
       - lowrisc:prim:all
@@ -39,6 +38,7 @@ filesets:
       - lowrisc:opentitan:top_englishbreakfast_pwrmgr
       - lowrisc:opentitan:top_englishbreakfast_rstmgr
       - lowrisc:opentitan:top_englishbreakfast_rv_plic
+      - lowrisc:opentitan:top_englishbreakfast_rv_core_ibex
       - lowrisc:ip:rom_ctrl
       - lowrisc:ip:aon_timer
       - lowrisc:tlul:headers