diff --git a/hw/dv/sv/flash_phy_prim_agent/flash_phy_prim_agent.core b/hw/dv/sv/flash_phy_prim_agent/flash_phy_prim_agent.core index 56d8ac5e5142a..fd41c86850a8b 100644 --- a/hw/dv/sv/flash_phy_prim_agent/flash_phy_prim_agent.core +++ b/hw/dv/sv/flash_phy_prim_agent/flash_phy_prim_agent.core @@ -9,7 +9,7 @@ filesets: depend: - lowrisc:dv:dv_utils - lowrisc:dv:dv_lib - - lowrisc:ip_interfaces:flash_ctrl_pkg + - lowrisc:virtual_ip:flash_ctrl_pkg files: - flash_phy_prim_if.sv - flash_phy_prim_agent_pkg.sv diff --git a/hw/ip/keymgr/keymgr.core b/hw/ip/keymgr/keymgr.core index eb6a8a38ec66d..dabea6e31b3e6 100644 --- a/hw/ip/keymgr/keymgr.core +++ b/hw/ip/keymgr/keymgr.core @@ -18,7 +18,7 @@ filesets: - lowrisc:prim:sec_anchor - lowrisc:prim:secded - lowrisc:prim:sparse_fsm - - lowrisc:ip_interfaces:flash_ctrl_pkg + - lowrisc:virtual_ip:flash_ctrl_pkg - lowrisc:ip:keymgr_pkg - lowrisc:ip:kmac_pkg - lowrisc:ip:otp_ctrl_pkg diff --git a/hw/ip/lc_ctrl/lc_ctrl.core b/hw/ip/lc_ctrl/lc_ctrl.core index 7268b145d4df1..2141ebf6fd0b6 100644 --- a/hw/ip/lc_ctrl/lc_ctrl.core +++ b/hw/ip/lc_ctrl/lc_ctrl.core @@ -17,11 +17,11 @@ filesets: - lowrisc:prim:sparse_fsm - lowrisc:ip:lc_ctrl_pkg - lowrisc:ip:tlul - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:virtual_ip:pwrmgr_pkg - lowrisc:ip:otp_ctrl_pkg - lowrisc:ip:kmac_pkg - lowrisc:ip:rv_dm - - lowrisc:ip_interfaces:alert_handler_pkg + - lowrisc:virtual_ip:alert_handler_pkg files: - rtl/lc_ctrl_regs_reg_top.sv - rtl/lc_ctrl_dmi_reg_top.sv diff --git a/hw/ip/prim_generic/prim_generic_flash.core b/hw/ip/prim_generic/prim_generic_flash.core index d5809ba46efdf..b68f1a998da82 100644 --- a/hw/ip/prim_generic/prim_generic_flash.core +++ b/hw/ip/prim_generic/prim_generic_flash.core @@ -12,8 +12,8 @@ filesets: - lowrisc:prim:ram_1p - "fileset_partner ? (partner:systems:ast_pkg)" - "!fileset_partner ? (lowrisc:systems:ast_pkg)" - - lowrisc:ip_interfaces:flash_ctrl_pkg - - lowrisc:ip_interfaces:flash_ctrl_prim_reg_top + - lowrisc:virtual_ip:flash_ctrl_pkg + - lowrisc:virtual_ip:flash_ctrl_prim_reg_top files: - rtl/prim_generic_flash_bank.sv - rtl/prim_generic_flash.sv diff --git a/hw/ip/soc_dbg_ctrl/soc_dbg_ctrl.core b/hw/ip/soc_dbg_ctrl/soc_dbg_ctrl.core index ad68307ca6ebb..9dab1b5267d43 100644 --- a/hw/ip/soc_dbg_ctrl/soc_dbg_ctrl.core +++ b/hw/ip/soc_dbg_ctrl/soc_dbg_ctrl.core @@ -10,7 +10,7 @@ filesets: - lowrisc:prim:all - lowrisc:ip:tlul - lowrisc:ip:soc_dbg_ctrl_pkg - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:virtual_ip:pwrmgr_pkg - lowrisc:ip:lc_ctrl_pkg files: - rtl/soc_dbg_ctrl_reg_pkg.sv diff --git a/hw/ip_templates/ac_range_check/data/ac_range_check.tpldesc.hjson b/hw/ip_templates/ac_range_check/data/ac_range_check.tpldesc.hjson index efbf4b09ec175..1de6322f6aa9a 100644 --- a/hw/ip_templates/ac_range_check/data/ac_range_check.tpldesc.hjson +++ b/hw/ip_templates/ac_range_check/data/ac_range_check.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "module_instance_name" desc: "instance name in case there are multiple AC Range Check instances" diff --git a/hw/ip_templates/alert_handler/alert_handler_pkg.core.tpl b/hw/ip_templates/alert_handler/alert_handler_pkg.core.tpl index cd3782e770848..b029aec133b6c 100644 --- a/hw/ip_templates/alert_handler/alert_handler_pkg.core.tpl +++ b/hw/ip_templates/alert_handler/alert_handler_pkg.core.tpl @@ -5,7 +5,7 @@ CAPI=2: name: ${instance_vlnv(f"lowrisc:ip:{module_instance_name}_pkg:0.1")} description: "Alert Handler constants in packages" virtual: - - "lowrisc:ip_interfaces:${module_instance_name}_pkg" + - "lowrisc:virtual_ip:${module_instance_name}_pkg" filesets: files_rtl: diff --git a/hw/ip_templates/alert_handler/data/alert_handler.tpldesc.hjson b/hw/ip_templates/alert_handler/data/alert_handler.tpldesc.hjson index e308897990691..7c0c699ee9ae6 100644 --- a/hw/ip_templates/alert_handler/data/alert_handler.tpldesc.hjson +++ b/hw/ip_templates/alert_handler/data/alert_handler.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "n_alerts" desc: "Number of alert sources" diff --git a/hw/ip_templates/clkmgr/clkmgr.core.tpl b/hw/ip_templates/clkmgr/clkmgr.core.tpl index 7e739f5d0dbf9..cf11cedd50c5c 100644 --- a/hw/ip_templates/clkmgr/clkmgr.core.tpl +++ b/hw/ip_templates/clkmgr/clkmgr.core.tpl @@ -9,7 +9,7 @@ filesets: files_rtl: depend: - lowrisc:ip:lc_ctrl_pkg - - ${instance_vlnv("lowrisc:ip:pwrmgr_pkg", pwrmgr_vlnv_prefix)} + - ${instance_vlnv("lowrisc:ip:pwrmgr_pkg")} - lowrisc:ip:tlul - lowrisc:prim:all - lowrisc:prim:buf diff --git a/hw/ip_templates/clkmgr/clkmgr_pkg.core.tpl b/hw/ip_templates/clkmgr/clkmgr_pkg.core.tpl index ab0351ec92383..417efe99537a5 100644 --- a/hw/ip_templates/clkmgr/clkmgr_pkg.core.tpl +++ b/hw/ip_templates/clkmgr/clkmgr_pkg.core.tpl @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: ${instance_vlnv("lowrisc:systems:clkmgr_pkg:0.1")} +name: ${instance_vlnv("lowrisc:ip:clkmgr_pkg:0.1")} description: "Top specific clock manager package" virtual: - - lowrisc:ip_interfaces:clkmgr_pkg + - lowrisc:virtual_ip:clkmgr_pkg filesets: files_rtl: diff --git a/hw/ip_templates/clkmgr/data/clkmgr.tpldesc.hjson b/hw/ip_templates/clkmgr/data/clkmgr.tpldesc.hjson index e105c99a88c09..861d4cfbce479 100644 --- a/hw/ip_templates/clkmgr/data/clkmgr.tpldesc.hjson +++ b/hw/ip_templates/clkmgr/data/clkmgr.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "src_clks" desc: "The source clocks" diff --git a/hw/ip_templates/flash_ctrl/data/flash_ctrl.tpldesc.hjson b/hw/ip_templates/flash_ctrl/data/flash_ctrl.tpldesc.hjson index 3ffe98447ef1b..2c84c80db8130 100644 --- a/hw/ip_templates/flash_ctrl/data/flash_ctrl.tpldesc.hjson +++ b/hw/ip_templates/flash_ctrl/data/flash_ctrl.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "banks" desc: "Number of banks" diff --git a/hw/ip_templates/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core.tpl b/hw/ip_templates/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core.tpl index 16f33a2c49e53..eaaff976d8bb1 100644 --- a/hw/ip_templates/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core.tpl +++ b/hw/ip_templates/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core.tpl @@ -13,7 +13,7 @@ filesets: - lowrisc:dv:crypto_dpi_prince:0.1 - lowrisc:dv:crypto_dpi_present:0.1 - lowrisc:prim:secded:0.1 - - ${instance_vlnv("lowrisc:ip_interfaces:flash_ctrl_pkg")} + - ${instance_vlnv("lowrisc:ip:flash_ctrl_pkg")} - lowrisc:dv:mem_bkdr_util files: - flash_ctrl_bkdr_util_pkg.sv diff --git a/hw/ip_templates/flash_ctrl/flash_ctrl_pkg.core.tpl b/hw/ip_templates/flash_ctrl/flash_ctrl_pkg.core.tpl index c222da0d1ab76..5da7121c327ec 100644 --- a/hw/ip_templates/flash_ctrl/flash_ctrl_pkg.core.tpl +++ b/hw/ip_templates/flash_ctrl/flash_ctrl_pkg.core.tpl @@ -5,7 +5,7 @@ CAPI=2: name: ${instance_vlnv("lowrisc:ip:flash_ctrl_pkg:0.1")} description: "Top specific flash package" virtual: - - lowrisc:ip_interfaces:flash_ctrl_pkg + - lowrisc:virtual_ip:flash_ctrl_pkg filesets: files_rtl: @@ -13,7 +13,7 @@ filesets: - ${top_pkg_vlnv} - lowrisc:prim:util - lowrisc:ip:lc_ctrl_pkg - - ${instance_vlnv("lowrisc:ip:pwrmgr_pkg", pwrmgr_vlnv_prefix)} + - ${instance_vlnv("lowrisc:ip:pwrmgr_pkg")} - lowrisc:ip:jtag_pkg - lowrisc:ip:edn_pkg - lowrisc:tlul:headers diff --git a/hw/ip_templates/flash_ctrl/flash_ctrl_prim_reg_top.core.tpl b/hw/ip_templates/flash_ctrl/flash_ctrl_prim_reg_top.core.tpl index dcd18ecef4745..9b97fe37d9977 100644 --- a/hw/ip_templates/flash_ctrl/flash_ctrl_prim_reg_top.core.tpl +++ b/hw/ip_templates/flash_ctrl/flash_ctrl_prim_reg_top.core.tpl @@ -5,7 +5,7 @@ CAPI=2: name: ${instance_vlnv("lowrisc:ip:flash_ctrl_prim_reg_top:1.0")} description: "Generic register top for the FLASH wrapper" virtual: - - lowrisc:ip_interfaces:flash_ctrl_prim_reg_top + - lowrisc:virtual_ip:flash_ctrl_prim_reg_top filesets: files_rtl: diff --git a/hw/ip_templates/otp_ctrl/data/otp_ctrl.tpldesc.hjson b/hw/ip_templates/otp_ctrl/data/otp_ctrl.tpldesc.hjson index bad1445ec4271..d1ff5bd8cef23 100644 --- a/hw/ip_templates/otp_ctrl/data/otp_ctrl.tpldesc.hjson +++ b/hw/ip_templates/otp_ctrl/data/otp_ctrl.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "otp_mmap" desc: "An object containing the memory map and all attributes" diff --git a/hw/ip_templates/otp_ctrl/dv/cov/otp_ctrl_cov.core.tpl b/hw/ip_templates/otp_ctrl/dv/cov/otp_ctrl_cov.core.tpl index b2d8d0aa61013..ee52eda7e138c 100644 --- a/hw/ip_templates/otp_ctrl/dv/cov/otp_ctrl_cov.core.tpl +++ b/hw/ip_templates/otp_ctrl/dv/cov/otp_ctrl_cov.core.tpl @@ -4,13 +4,11 @@ CAPI=2: # SPDX-License-Identifier: Apache-2.0 name: ${instance_vlnv("lowrisc:dv:otp_ctrl_cov")} description: "OTP_CTRL functional coverage and bind files" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_cov filesets: files_rtl: depend: - - lowrisc:ip_interfaces:pwrmgr_pkg + - ${instance_vlnv("lowrisc:ip:pwrmgr_pkg")} - ${instance_vlnv("lowrisc:ip:otp_ctrl_top_specific_pkg")} files_dv: diff --git a/hw/ip_templates/otp_ctrl/dv/env/otp_ctrl_env.core.tpl b/hw/ip_templates/otp_ctrl/dv/env/otp_ctrl_env.core.tpl index 2ca4e67fa64a2..bf6a220fdb107 100644 --- a/hw/ip_templates/otp_ctrl/dv/env/otp_ctrl_env.core.tpl +++ b/hw/ip_templates/otp_ctrl/dv/env/otp_ctrl_env.core.tpl @@ -4,8 +4,6 @@ CAPI=2: # SPDX-License-Identifier: Apache-2.0 name: ${instance_vlnv("lowrisc:dv:otp_ctrl_env:0.1")} description: "OTP_CTRL DV UVM environment" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_env filesets: files_dv: diff --git a/hw/ip_templates/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core.tpl b/hw/ip_templates/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core.tpl index 51fdf33196534..ebaf1c4a3195b 100644 --- a/hw/ip_templates/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core.tpl +++ b/hw/ip_templates/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core.tpl @@ -4,8 +4,6 @@ CAPI=2: # SPDX-License-Identifier: Apache-2.0 name: ${instance_vlnv("lowrisc:dv:otp_ctrl_mem_bkdr_util:0.1")} description: "OTP_CTRL mem_bkdr_util support package" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_mem_bkdr_util filesets: files_dv: diff --git a/hw/ip_templates/otp_ctrl/dv/otp_ctrl_sim.core.tpl b/hw/ip_templates/otp_ctrl/dv/otp_ctrl_sim.core.tpl index 47b3c112bcef6..6a88c5068170c 100644 --- a/hw/ip_templates/otp_ctrl/dv/otp_ctrl_sim.core.tpl +++ b/hw/ip_templates/otp_ctrl/dv/otp_ctrl_sim.core.tpl @@ -4,8 +4,6 @@ CAPI=2: # SPDX-License-Identifier: Apache-2.0 name: ${instance_vlnv("lowrisc:dv:otp_ctrl_sim:0.1")} description: "OTP_CTRL DV sim target" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_sim filesets: files_rtl: diff --git a/hw/ip_templates/otp_ctrl/dv/sva/otp_ctrl_sva.core.tpl b/hw/ip_templates/otp_ctrl/dv/sva/otp_ctrl_sva.core.tpl index 4480e00bd2d1d..f866625c4d85f 100644 --- a/hw/ip_templates/otp_ctrl/dv/sva/otp_ctrl_sva.core.tpl +++ b/hw/ip_templates/otp_ctrl/dv/sva/otp_ctrl_sva.core.tpl @@ -4,8 +4,6 @@ CAPI=2: # SPDX-License-Identifier: Apache-2.0 name: ${instance_vlnv("lowrisc:dv:otp_ctrl_sva:0.1")} description: "OTP_CTRL assertion modules and bind file." -virtual: - - lowrisc:ip_interfaces:otp_ctrl_sva filesets: files_dv: diff --git a/hw/ip_templates/otp_ctrl/dv/tests/otp_ctrl_test.core.tpl b/hw/ip_templates/otp_ctrl/dv/tests/otp_ctrl_test.core.tpl index 04c039268326f..3985e0014c2e2 100644 --- a/hw/ip_templates/otp_ctrl/dv/tests/otp_ctrl_test.core.tpl +++ b/hw/ip_templates/otp_ctrl/dv/tests/otp_ctrl_test.core.tpl @@ -4,8 +4,6 @@ CAPI=2: # SPDX-License-Identifier: Apache-2.0 name: ${instance_vlnv("lowrisc:dv:otp_ctrl_test:0.1")} description: "OTP_CTRL DV UVM test" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_test filesets: files_dv: diff --git a/hw/ip_templates/otp_ctrl/otp_ctrl.core.tpl b/hw/ip_templates/otp_ctrl/otp_ctrl.core.tpl index f759777866a5a..2fc99e3faf8a2 100644 --- a/hw/ip_templates/otp_ctrl/otp_ctrl.core.tpl +++ b/hw/ip_templates/otp_ctrl/otp_ctrl.core.tpl @@ -5,7 +5,7 @@ CAPI=2: name: ${instance_vlnv("lowrisc:ip:otp_ctrl:1.0")} description: "OTP Controller" virtual: - - lowrisc:ip_interfaces:otp_ctrl + - lowrisc:virtual_ip:otp_ctrl filesets: files_rtl: @@ -25,7 +25,7 @@ filesets: - lowrisc:prim:secded - lowrisc:prim:edn_req - lowrisc:prim:sec_anchor - - lowrisc:ip_interfaces:pwrmgr_pkg + - ${instance_vlnv("lowrisc:ip:pwrmgr_pkg")} - lowrisc:ip:edn_pkg - lowrisc:prim:sparse_fsm - "fileset_partner ? (partner:systems:ast_pkg)" diff --git a/hw/ip_templates/otp_ctrl/otp_ctrl_prim_reg_top.core b/hw/ip_templates/otp_ctrl/otp_ctrl_prim_reg_top.core index 817b3e74434c6..0ee457b560ea6 100644 --- a/hw/ip_templates/otp_ctrl/otp_ctrl_prim_reg_top.core +++ b/hw/ip_templates/otp_ctrl/otp_ctrl_prim_reg_top.core @@ -10,7 +10,7 @@ filesets: # otp_ctrl_prim_reg_top.sv should depend on generic items for now. # This may change and will require reworking the flow to generate # the otp prim. - - lowrisc:ip_interfaces:otp_ctrl_top_specific_pkg + - lowrisc:virtual_ip:otp_ctrl_top_specific_pkg files: - rtl/otp_ctrl_prim_reg_top.sv file_type: systemVerilogSource diff --git a/hw/ip_templates/otp_ctrl/otp_ctrl_top_specific_pkg.core.tpl b/hw/ip_templates/otp_ctrl/otp_ctrl_top_specific_pkg.core.tpl index d90773b598db1..f273be3db8489 100644 --- a/hw/ip_templates/otp_ctrl/otp_ctrl_top_specific_pkg.core.tpl +++ b/hw/ip_templates/otp_ctrl/otp_ctrl_top_specific_pkg.core.tpl @@ -5,7 +5,7 @@ CAPI=2: name: ${instance_vlnv("lowrisc:ip:otp_ctrl_top_specific_pkg:1.0")} description: "OTP Controller Top Specific Packages" virtual: - - lowrisc:ip_interfaces:otp_ctrl_top_specific_pkg + - lowrisc:virtual_ip:otp_ctrl_top_specific_pkg filesets: files_rtl: diff --git a/hw/ip_templates/pinmux/data/pinmux.tpldesc.hjson b/hw/ip_templates/pinmux/data/pinmux.tpldesc.hjson index e9f1e5b503016..60bd3693d261d 100644 --- a/hw/ip_templates/pinmux/data/pinmux.tpldesc.hjson +++ b/hw/ip_templates/pinmux/data/pinmux.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "n_wkup_detect" desc: "Number of wakeups" diff --git a/hw/ip_templates/pinmux/pinmux_pkg.core.tpl b/hw/ip_templates/pinmux/pinmux_pkg.core.tpl index 52351bf4cd88c..8c68f0632bb44 100644 --- a/hw/ip_templates/pinmux/pinmux_pkg.core.tpl +++ b/hw/ip_templates/pinmux/pinmux_pkg.core.tpl @@ -5,7 +5,7 @@ CAPI=2: name: ${instance_vlnv("lowrisc:ip:pinmux_pkg:0.1")} description: "Pinmux package" virtual: - - lowrisc:ip_interfaces:pinmux_pkg + - lowrisc:virtual_ip:pinmux_pkg filesets: files_rtl: diff --git a/hw/ip_templates/pwrmgr/data/pwrmgr.tpldesc.hjson b/hw/ip_templates/pwrmgr/data/pwrmgr.tpldesc.hjson index 80c9314168d6f..d36b78231988f 100644 --- a/hw/ip_templates/pwrmgr/data/pwrmgr.tpldesc.hjson +++ b/hw/ip_templates/pwrmgr/data/pwrmgr.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "NumWkups" desc: "Number of wakeup requests" diff --git a/hw/ip_templates/pwrmgr/pwrmgr_pkg.core.tpl b/hw/ip_templates/pwrmgr/pwrmgr_pkg.core.tpl index 8a35605dd8271..21344bbd82a60 100644 --- a/hw/ip_templates/pwrmgr/pwrmgr_pkg.core.tpl +++ b/hw/ip_templates/pwrmgr/pwrmgr_pkg.core.tpl @@ -5,7 +5,7 @@ CAPI=2: name: ${instance_vlnv("lowrisc:ip:pwrmgr_pkg:0.1")} description: "Power manager package" virtual: - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:virtual_ip:pwrmgr_pkg filesets: files_rtl: diff --git a/hw/ip_templates/racl_ctrl/data/racl_ctrl.tpldesc.hjson b/hw/ip_templates/racl_ctrl/data/racl_ctrl.tpldesc.hjson index 098b2918b6c37..c0c37db2bf24d 100644 --- a/hw/ip_templates/racl_ctrl/data/racl_ctrl.tpldesc.hjson +++ b/hw/ip_templates/racl_ctrl/data/racl_ctrl.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "module_instance_name" desc: "instance name in case there are multiple RACL Ctrl instances" diff --git a/hw/ip_templates/rstmgr/data/rstmgr.tpldesc.hjson b/hw/ip_templates/rstmgr/data/rstmgr.tpldesc.hjson index 90e51fd5bf6f4..ce7f002aa69df 100644 --- a/hw/ip_templates/rstmgr/data/rstmgr.tpldesc.hjson +++ b/hw/ip_templates/rstmgr/data/rstmgr.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "clks" desc: "List of source clocks, as in 'aon', 'io', 'io_div2'" diff --git a/hw/ip_templates/rstmgr/rstmgr_pkg.core.tpl b/hw/ip_templates/rstmgr/rstmgr_pkg.core.tpl index 7d9167871d3a9..d4ea8de188037 100644 --- a/hw/ip_templates/rstmgr/rstmgr_pkg.core.tpl +++ b/hw/ip_templates/rstmgr/rstmgr_pkg.core.tpl @@ -4,8 +4,6 @@ CAPI=2: # SPDX-License-Identifier: Apache-2.0 name: ${instance_vlnv("lowrisc:ip:rstmgr_pkg:0.1")} description: "Reset manager package" -virtual: - - lowrisc:ip_interfaces:rstmgr_pkg filesets: files_rtl: diff --git a/hw/ip_templates/rv_plic/data/rv_plic.tpldesc.hjson b/hw/ip_templates/rv_plic/data/rv_plic.tpldesc.hjson index f68b89c0bcd4b..ce16aa431c94f 100644 --- a/hw/ip_templates/rv_plic/data/rv_plic.tpldesc.hjson +++ b/hw/ip_templates/rv_plic/data/rv_plic.tpldesc.hjson @@ -9,6 +9,12 @@ type: "string" default: "" } + { + name: "uniquified_modules" + desc: "A dictionary mapping template_names to uniquified_names" + type: "object" + default: {"clkmgr": "clkmgr1"} + } { name: "src" desc: "Number of interrupt sources" diff --git a/hw/top_darjeeling/ip_autogen/ac_range_check/ac_range_check.core b/hw/top_darjeeling/ip_autogen/ac_range_check/ac_range_check.core index c74c91756816e..6ca8eeb895474 100644 --- a/hw/top_darjeeling/ip_autogen/ac_range_check/ac_range_check.core +++ b/hw/top_darjeeling/ip_autogen/ac_range_check/ac_range_check.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_ac_range_check:0.1 +name: lowrisc:darjeeling_ip:ac_range_check:0.1 description: "AC Range Check RTL" filesets: diff --git a/hw/top_darjeeling/ip_autogen/ac_range_check/data/top_darjeeling_ac_range_check.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/ac_range_check/data/top_darjeeling_ac_range_check.ipconfig.hjson index 5062f6a190b7a..b2a44e380dc14 100644 --- a/hw/top_darjeeling/ip_autogen/ac_range_check/data/top_darjeeling_ac_range_check.ipconfig.hjson +++ b/hw/top_darjeeling/ip_autogen/ac_range_check/data/top_darjeeling_ac_range_check.ipconfig.hjson @@ -10,5 +10,12 @@ nr_role_bits: 4 nr_ctn_uid_bits: 5 topname: darjeeling + uniquified_modules: + { + racl_ctrl: racl_ctrl + ac_range_check: ac_range_check + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/ac_range_check_sim.core b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/ac_range_check_sim.core index d71b1bc3feb72..36af18a22ebad 100644 --- a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/ac_range_check_sim.core +++ b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/ac_range_check_sim.core @@ -2,19 +2,19 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_ac_range_check_sim:0.1 +name: lowrisc:darjeeling_dv:ac_range_check_sim:0.1 description: "AC_RANGE_CHECK DV sim target" filesets: files_rtl: depend: - lowrisc:ip:tlul - - lowrisc:opentitan:top_darjeeling_ac_range_check:0.1 + - lowrisc:darjeeling_ip:ac_range_check:0.1 file_type: systemVerilogSource files_dv: depend: - - lowrisc:opentitan:top_darjeeling_ac_range_check_test - - lowrisc:opentitan:top_darjeeling_ac_range_check_sva + - lowrisc:darjeeling_dv:ac_range_check_test + - lowrisc:darjeeling_dv:ac_range_check_sva files: - tb/tb.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/ac_range_check_sim_cfg.hjson b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/ac_range_check_sim_cfg.hjson index 7ec5eee0e92f0..60617d3451088 100644 --- a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/ac_range_check_sim_cfg.hjson +++ b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/ac_range_check_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: xcelium // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_darjeeling_ac_range_check_sim:0.1 + fusesoc_core: lowrisc:darjeeling_dv:ac_range_check_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/ac_range_check_testplan.hjson" diff --git a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/env/ac_range_check_env.core b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/env/ac_range_check_env.core index b4c7a2580e21f..dee88e0c285c0 100644 --- a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/env/ac_range_check_env.core +++ b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/env/ac_range_check_env.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_ac_range_check_env:0.1 +name: lowrisc:darjeeling_dv:ac_range_check_env:0.1 description: "AC_RANGE_CHECK DV UVM environment" filesets: files_dv: diff --git a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/sva/ac_range_check_sva.core b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/sva/ac_range_check_sva.core index a2a24d67fe8a3..9d7f0916dc97b 100644 --- a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/sva/ac_range_check_sva.core +++ b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/sva/ac_range_check_sva.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_ac_range_check_sva:0.1 +name: lowrisc:darjeeling_dv:ac_range_check_sva:0.1 description: "AC_RANGE_CHECK assertion modules and bind file." filesets: files_dv: @@ -15,7 +15,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_darjeeling_ac_range_check + - lowrisc:darjeeling_ip:ac_range_check generate: csr_assert_gen: diff --git a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/tests/ac_range_check_test.core b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/tests/ac_range_check_test.core index 4919631b32638..1844e74e5d25f 100644 --- a/hw/top_darjeeling/ip_autogen/ac_range_check/dv/tests/ac_range_check_test.core +++ b/hw/top_darjeeling/ip_autogen/ac_range_check/dv/tests/ac_range_check_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_ac_range_check_test:0.1 +name: lowrisc:darjeeling_dv:ac_range_check_test:0.1 description: "AC_RANGE_CHECK DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_darjeeling_ac_range_check_env + - lowrisc:darjeeling_dv:ac_range_check_env files: - ac_range_check_test_pkg.sv - ac_range_check_base_test.sv: {is_include_file: true} diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler.core b/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler.core index e4114b5048a60..91b861ea38842 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler:0.1 +name: lowrisc:darjeeling_ip:alert_handler:0.1 description: "Alert Handler" filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_alert_handler_component:0.1 - - lowrisc:opentitan:top_darjeeling_alert_handler_reg:0.1 + - lowrisc:darjeeling_ip:alert_handler_component:0.1 + - lowrisc:darjeeling_ip:alert_handler_reg:0.1 file_type: systemVerilogSource parameters: diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_component.core b/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_component.core index cd0ed4deec2df..6c3875e362722 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_component.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_component.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_component:0.1 +name: lowrisc:darjeeling_ip:alert_handler_component:0.1 description: "Alert Handler component without the CSRs" filesets: @@ -17,7 +17,7 @@ filesets: - lowrisc:prim:buf - lowrisc:prim:mubi - lowrisc:prim:sparse_fsm - - lowrisc:opentitan:top_darjeeling_alert_handler_reg + - lowrisc:darjeeling_ip:alert_handler_reg files: - rtl/alert_handler_reg_wrap.sv - rtl/alert_handler_lpg_ctrl.sv diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_pkg.core b/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_pkg.core index 505af8c0548a7..451c0f6e09074 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_pkg.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_pkg:0.1 +name: lowrisc:darjeeling_ip:alert_handler_pkg:0.1 description: "Alert Handler constants in packages" virtual: - - "lowrisc:ip_interfaces:alert_handler_pkg" + - "lowrisc:virtual_ip:alert_handler_pkg" filesets: files_rtl: diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_reg.core b/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_reg.core index 323133cab70f1..e3675782ae3e7 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_reg.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/alert_handler_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_reg:0.1 +name: lowrisc:darjeeling_ip:alert_handler_reg:0.1 description: "Auto-generated alert handler register sources" filesets: @@ -11,7 +11,7 @@ filesets: - lowrisc:prim:subreg - lowrisc:ip:tlul - lowrisc:prim:subreg - - lowrisc:opentitan:top_darjeeling_alert_handler_pkg + - lowrisc:darjeeling_ip:alert_handler_pkg files: - rtl/alert_handler_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/data/top_darjeeling_alert_handler.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/alert_handler/data/top_darjeeling_alert_handler.ipconfig.hjson index 49960be1f4b78..b2ad97b0658da 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/data/top_darjeeling_alert_handler.ipconfig.hjson +++ b/hw/top_darjeeling/ip_autogen/alert_handler/data/top_darjeeling_alert_handler.ipconfig.hjson @@ -225,5 +225,12 @@ ] top_pkg_vlnv: lowrisc:constants:top_darjeeling_top_pkg topname: darjeeling + uniquified_modules: + { + racl_ctrl: racl_ctrl + ac_range_check: ac_range_check + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/dv/alert_handler_sim.core b/hw/top_darjeeling/ip_autogen/alert_handler/dv/alert_handler_sim.core index 5149ef2a72be4..0eab3e6c3a621 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/dv/alert_handler_sim.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/dv/alert_handler_sim.core @@ -2,20 +2,20 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_sim:0.1 +name: lowrisc:darjeeling_dv:alert_handler_sim:0.1 description: "ALERT_HANDLER DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_alert_handler:0.1 + - lowrisc:darjeeling_ip:alert_handler:0.1 file_type: systemVerilogSource files_dv: depend: - lowrisc:dv:ralgen - - lowrisc:opentitan:top_darjeeling_alert_handler_tb:0.1 - - lowrisc:opentitan:top_darjeeling_alert_handler_cov:0.1 - - lowrisc:opentitan:top_darjeeling_alert_handler_sva:0.1 + - lowrisc:darjeeling_dv:alert_handler_tb:0.1 + - lowrisc:darjeeling_dv:alert_handler_cov:0.1 + - lowrisc:darjeeling_dv:alert_handler_sva:0.1 file_type: systemVerilogSource generate: diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson b/hw/top_darjeeling/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson index fa7e5390710ae..692f238d2bddd 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson +++ b/hw/top_darjeeling/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_darjeeling_alert_handler_sim:0.1 + fusesoc_core: lowrisc:darjeeling_dv:alert_handler_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/alert_handler_testplan.hjson" diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/dv/cov/alert_handler_cov.core b/hw/top_darjeeling/ip_autogen/alert_handler/dv/cov/alert_handler_cov.core index 2df81bb39853b..feacc778b679f 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/dv/cov/alert_handler_cov.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/dv/cov/alert_handler_cov.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_cov:0.1 +name: lowrisc:darjeeling_dv:alert_handler_cov:0.1 description: "ALERT_HANDLER cov bind files" filesets: files_dv: depend: - - lowrisc:opentitan:top_darjeeling_alert_handler_component:0.1 # import alert_handler_pkg + - lowrisc:darjeeling_ip:alert_handler_component:0.1 # import alert_handler_pkg - lowrisc:dv:dv_utils files: - alert_handler_cov_bind.sv diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/dv/env/alert_handler_env.core b/hw/top_darjeeling/ip_autogen/alert_handler/dv/env/alert_handler_env.core index bf1beb11e0d1d..47603b6dd0bff 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/dv/env/alert_handler_env.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/dv/env/alert_handler_env.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_env:0.1 +name: lowrisc:darjeeling_dv:alert_handler_env:0.1 description: "ALERT_HANDLER DV UVM environment" filesets: files_dv: depend: - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_darjeeling_alert_handler_pkg:0.1 + - lowrisc:darjeeling_ip:alert_handler_pkg:0.1 - lowrisc:prim:mubi_pkg - lowrisc:constants:top_darjeeling_top_pkg files: diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/dv/sva/alert_handler_sva.core b/hw/top_darjeeling/ip_autogen/alert_handler/dv/sva/alert_handler_sva.core index 57a7e7749bd6f..5e22343dd4f9d 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/dv/sva/alert_handler_sva.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/dv/sva/alert_handler_sva.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_sva:0.1 +name: lowrisc:darjeeling_dv:alert_handler_sva:0.1 description: "ALERT_HANDLER assertion modules and bind file." filesets: files_dv: @@ -15,7 +15,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_darjeeling_alert_handler:0.1 + - lowrisc:darjeeling_ip:alert_handler:0.1 generate: csr_assert_gen: diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/dv/tb/alert_handler_tb.core b/hw/top_darjeeling/ip_autogen/alert_handler/dv/tb/alert_handler_tb.core index 7a352bba75c01..42ace94df0db1 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/dv/tb/alert_handler_tb.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/dv/tb/alert_handler_tb.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_tb:0.1 +name: lowrisc:darjeeling_dv:alert_handler_tb:0.1 description: "ALERT_HANDLER UVM TB environment" filesets: files_dv: depend: - - lowrisc:opentitan:top_darjeeling_alert_handler_test:0.1 + - lowrisc:darjeeling_dv:alert_handler_test:0.1 files: - tb.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/dv/tests/alert_handler_test.core b/hw/top_darjeeling/ip_autogen/alert_handler/dv/tests/alert_handler_test.core index 3204367b6fa71..6a76596dd8f48 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/dv/tests/alert_handler_test.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/dv/tests/alert_handler_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_test:0.1 +name: lowrisc:darjeeling_dv:alert_handler_test:0.1 description: "ALERT_HANDLER DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_darjeeling_alert_handler_env + - lowrisc:darjeeling_dv:alert_handler_env files: - alert_handler_test_pkg.sv - alert_handler_base_test.sv: {is_include_file: true} diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/fpv/alert_handler_esc_timer_fpv.core b/hw/top_darjeeling/ip_autogen/alert_handler/fpv/alert_handler_esc_timer_fpv.core index 721b801f11f0d..ae30dd8870c97 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/fpv/alert_handler_esc_timer_fpv.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/fpv/alert_handler_esc_timer_fpv.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_esc_timer_fpv:0.1 +name: lowrisc:darjeeling_fpv:alert_handler_esc_timer_fpv:0.1 description: "alert_handler_esc_timer FPV target" filesets: files_formal: depend: - lowrisc:prim:all - - lowrisc:opentitan:top_darjeeling_alert_handler + - lowrisc:darjeeling_ip:alert_handler files: - vip/alert_handler_esc_timer_assert_fpv.sv - tb/alert_handler_esc_timer_bind_fpv.sv diff --git a/hw/top_darjeeling/ip_autogen/alert_handler/fpv/alert_handler_ping_timer_fpv.core b/hw/top_darjeeling/ip_autogen/alert_handler/fpv/alert_handler_ping_timer_fpv.core index 60f051f50e2e1..0bf14d3a8948a 100644 --- a/hw/top_darjeeling/ip_autogen/alert_handler/fpv/alert_handler_ping_timer_fpv.core +++ b/hw/top_darjeeling/ip_autogen/alert_handler/fpv/alert_handler_ping_timer_fpv.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_alert_handler_ping_timer_fpv:0.1 +name: lowrisc:darjeeling_fpv:alert_handler_ping_timer_fpv:0.1 description: "ALERT_HANDLER FPV target" filesets: files_formal: depend: - lowrisc:prim:all - - lowrisc:opentitan:top_darjeeling_alert_handler + - lowrisc:darjeeling_ip:alert_handler files: - vip/alert_handler_ping_timer_assert_fpv.sv - tb/alert_handler_ping_timer_bind_fpv.sv diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr.core b/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr.core index a1c8fa4de97f6..e725ad79931a3 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr.core +++ b/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_clkmgr:0.1 +name: lowrisc:darjeeling_ip:clkmgr:0.1 description: "Top specific clock manager " filesets: files_rtl: depend: - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg + - lowrisc:darjeeling_ip:pwrmgr_pkg - lowrisc:ip:tlul - lowrisc:prim:all - lowrisc:prim:buf @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:lc_sync - lowrisc:prim:lc_sender - lowrisc:prim:measure - - lowrisc:opentitan:top_darjeeling_clkmgr_pkg:0.1 - - lowrisc:opentitan:top_darjeeling_clkmgr_reg:0.1 + - lowrisc:darjeeling_ip:clkmgr_pkg:0.1 + - lowrisc:darjeeling_ip:clkmgr_reg:0.1 files: - rtl/clkmgr.sv - rtl/clkmgr_byp.sv diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr_pkg.core b/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr_pkg.core index f968b860fa2ab..fa5637233c6e8 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr_pkg.core +++ b/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_clkmgr_pkg:0.1 +name: lowrisc:darjeeling_ip:clkmgr_pkg:0.1 description: "Top specific clock manager package" virtual: - - lowrisc:ip_interfaces:clkmgr_pkg + - lowrisc:virtual_ip:clkmgr_pkg filesets: files_rtl: diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr_reg.core b/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr_reg.core index f9a1cec94e34e..f447d55614ad3 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr_reg.core +++ b/hw/top_darjeeling/ip_autogen/clkmgr/clkmgr_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_clkmgr_reg:0.1 +name: lowrisc:darjeeling_ip:clkmgr_reg:0.1 description: "Clock manager registers" filesets: diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/data/top_darjeeling_clkmgr.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/clkmgr/data/top_darjeeling_clkmgr.ipconfig.hjson index 6ee4e393630e0..1eb6c06a22dac 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/data/top_darjeeling_clkmgr.ipconfig.hjson +++ b/hw/top_darjeeling/ip_autogen/clkmgr/data/top_darjeeling_clkmgr.ipconfig.hjson @@ -247,5 +247,12 @@ pwrmgr_vlnv_prefix: top_darjeeling_ top_pkg_vlnv: lowrisc:constants:top_darjeeling_top_pkg topname: darjeeling + uniquified_modules: + { + racl_ctrl: racl_ctrl + ac_range_check: ac_range_check + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/dv/clkmgr_sim.core b/hw/top_darjeeling/ip_autogen/clkmgr/dv/clkmgr_sim.core index 356660b524a3d..5452422ac6320 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/dv/clkmgr_sim.core +++ b/hw/top_darjeeling/ip_autogen/clkmgr/dv/clkmgr_sim.core @@ -2,17 +2,17 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_clkmgr_sim:0.1 +name: lowrisc:darjeeling_dv:clkmgr_sim:0.1 description: "CLKMGR DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_clkmgr + - lowrisc:darjeeling_ip:clkmgr files_dv: depend: - - lowrisc:opentitan:top_darjeeling_clkmgr_test:0.1 - - lowrisc:opentitan:top_darjeeling_clkmgr_sva:0.1 + - lowrisc:darjeeling_dv:clkmgr_test:0.1 + - lowrisc:darjeeling_dv:clkmgr_sva:0.1 files: - tb.sv - cov/clkmgr_cov_bind.sv diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson b/hw/top_darjeeling/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson index dedb1367e45be..3bf3e6c3595dd 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson +++ b/hw/top_darjeeling/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_darjeeling_clkmgr_sim:0.1 + fusesoc_core: lowrisc:darjeeling_dv:clkmgr_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/clkmgr_testplan.hjson" diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/dv/env/clkmgr_env.core b/hw/top_darjeeling/ip_autogen/clkmgr/dv/env/clkmgr_env.core index 04a7215ccaa35..65b9659adc41a 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/dv/env/clkmgr_env.core +++ b/hw/top_darjeeling/ip_autogen/clkmgr/dv/env/clkmgr_env.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_clkmgr_env:0.1 +name: lowrisc:darjeeling_dv:clkmgr_env:0.1 description: "CLKMGR DV UVM environment" filesets: files_dv: depend: - lowrisc:dv:ralgen - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg - - lowrisc:opentitan:top_darjeeling_clkmgr_pkg + - lowrisc:darjeeling_ip:pwrmgr_pkg + - lowrisc:darjeeling_ip:clkmgr_pkg - lowrisc:constants:top_darjeeling_top_pkg files: - clkmgr_csrs_if.sv diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core b/hw/top_darjeeling/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core index dec9420fa0588..834a6c86c9711 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core +++ b/hw/top_darjeeling/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_clkmgr_sva:0.1 +name: lowrisc:darjeeling_dv:clkmgr_sva:0.1 description: "CLKMGR assertion modules and bind file." filesets: files_dv: depend: - lowrisc:tlul:headers - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_darjeeling_clkmgr_sva_ifs:0.1 + - lowrisc:darjeeling_dv:clkmgr_sva_ifs:0.1 files: - clkmgr_bind.sv - clkmgr_sec_cm_checker_assert.sv @@ -17,7 +17,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_darjeeling_clkmgr + - lowrisc:darjeeling_ip:clkmgr generate: csr_assert_gen: diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core b/hw/top_darjeeling/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core index 6f59c632a74da..e41cbf6778abd 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core +++ b/hw/top_darjeeling/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_clkmgr_sva_ifs:0.1 +name: lowrisc:darjeeling_dv:clkmgr_sva_ifs:0.1 description: "CLKMGR SVA interfaces." filesets: files_dv: diff --git a/hw/top_darjeeling/ip_autogen/clkmgr/dv/tests/clkmgr_test.core b/hw/top_darjeeling/ip_autogen/clkmgr/dv/tests/clkmgr_test.core index 292cbde520984..f54bafbe3a64a 100644 --- a/hw/top_darjeeling/ip_autogen/clkmgr/dv/tests/clkmgr_test.core +++ b/hw/top_darjeeling/ip_autogen/clkmgr/dv/tests/clkmgr_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_clkmgr_test:0.1 +name: lowrisc:darjeeling_dv:clkmgr_test:0.1 description: "CLKMGR DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_darjeeling_clkmgr_env:0.1 + - lowrisc:darjeeling_dv:clkmgr_env:0.1 files: - clkmgr_test_pkg.sv - clkmgr_base_test.sv: {is_include_file: true} diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/data/top_darjeeling_otp_ctrl.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/otp_ctrl/data/top_darjeeling_otp_ctrl.ipconfig.hjson index ddd0e65a6c750..a72bd59ed6408 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/data/top_darjeeling_otp_ctrl.ipconfig.hjson +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/data/top_darjeeling_otp_ctrl.ipconfig.hjson @@ -1988,5 +1988,12 @@ ] } topname: darjeeling + uniquified_modules: + { + racl_ctrl: racl_ctrl + ac_range_check: ac_range_check + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/cov/otp_ctrl_cov.core b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/cov/otp_ctrl_cov.core index 9ad10c4464d9a..949cb34185438 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/cov/otp_ctrl_cov.core +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/cov/otp_ctrl_cov.core @@ -2,16 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_otp_ctrl_cov +name: lowrisc:darjeeling_dv:otp_ctrl_cov description: "OTP_CTRL functional coverage and bind files" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_cov filesets: files_rtl: depend: - - lowrisc:ip_interfaces:pwrmgr_pkg - - lowrisc:opentitan:top_darjeeling_otp_ctrl_top_specific_pkg + - lowrisc:darjeeling_ip:pwrmgr_pkg + - lowrisc:darjeeling_ip:otp_ctrl_top_specific_pkg files_dv: depend: diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/env/otp_ctrl_env.core b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/env/otp_ctrl_env.core index 31dc00030ed40..ec1bcce0b612d 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/env/otp_ctrl_env.core +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/env/otp_ctrl_env.core @@ -2,10 +2,8 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_otp_ctrl_env:0.1 +name: lowrisc:darjeeling_dv:otp_ctrl_env:0.1 description: "OTP_CTRL DV UVM environment" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_env filesets: files_dv: diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core index e947715bd8a93..cdd3e1c18e3e2 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core @@ -2,10 +2,8 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_otp_ctrl_mem_bkdr_util:0.1 +name: lowrisc:darjeeling_dv:otp_ctrl_mem_bkdr_util:0.1 description: "OTP_CTRL mem_bkdr_util support package" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_mem_bkdr_util filesets: files_dv: @@ -13,7 +11,7 @@ filesets: - lowrisc:dv:mem_bkdr_util - lowrisc:dv:crypto_dpi_present - lowrisc:dv:lc_ctrl_dv_utils - - lowrisc:opentitan:top_darjeeling_otp_ctrl_top_specific_pkg:1.0 + - lowrisc:darjeeling_ip:otp_ctrl_top_specific_pkg:1.0 files: - otp_scrambler_pkg.sv - otp_ctrl_mem_bkdr_util_pkg.sv diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/otp_ctrl_sim.core b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/otp_ctrl_sim.core index b1ff3ab09e077..8824a16315d23 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/otp_ctrl_sim.core +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/otp_ctrl_sim.core @@ -2,22 +2,20 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_otp_ctrl_sim:0.1 +name: lowrisc:darjeeling_dv:otp_ctrl_sim:0.1 description: "OTP_CTRL DV sim target" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_sim filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_otp_ctrl + - lowrisc:darjeeling_ip:otp_ctrl files_dv: depend: - lowrisc:dv:mem_bkdr_util - - lowrisc:opentitan:top_darjeeling_otp_ctrl_test - - lowrisc:opentitan:top_darjeeling_otp_ctrl_sva - - lowrisc:opentitan:top_darjeeling_otp_ctrl_cov + - lowrisc:darjeeling_dv:otp_ctrl_test + - lowrisc:darjeeling_dv:otp_ctrl_sva + - lowrisc:darjeeling_dv:otp_ctrl_cov files: - tb.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/otp_ctrl_sim_cfg.hjson b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/otp_ctrl_sim_cfg.hjson index 62f35bc4fa6f6..e70de374973f5 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/otp_ctrl_sim_cfg.hjson +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/otp_ctrl_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_darjeeling_otp_ctrl_sim:0.1 + fusesoc_core: lowrisc:darjeeling_dv:otp_ctrl_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/otp_ctrl_testplan.hjson" diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/sva/otp_ctrl_sva.core b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/sva/otp_ctrl_sva.core index 8f1360da8ed0a..2952eab324362 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/sva/otp_ctrl_sva.core +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/sva/otp_ctrl_sva.core @@ -2,10 +2,8 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_otp_ctrl_sva:0.1 +name: lowrisc:darjeeling_dv:otp_ctrl_sva:0.1 description: "OTP_CTRL assertion modules and bind file." -virtual: - - lowrisc:ip_interfaces:otp_ctrl_sva filesets: files_dv: @@ -18,7 +16,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_darjeeling_otp_ctrl + - lowrisc:darjeeling_ip:otp_ctrl generate: csr_assert_gen: diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/tests/otp_ctrl_test.core b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/tests/otp_ctrl_test.core index c2591a8478b77..799f8bb31049b 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/tests/otp_ctrl_test.core +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/tests/otp_ctrl_test.core @@ -2,15 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_otp_ctrl_test:0.1 +name: lowrisc:darjeeling_dv:otp_ctrl_test:0.1 description: "OTP_CTRL DV UVM test" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_test filesets: files_dv: depend: - - lowrisc:opentitan:top_darjeeling_otp_ctrl_env + - lowrisc:darjeeling_dv:otp_ctrl_env files: - otp_ctrl_test_pkg.sv - otp_ctrl_base_test.sv: {is_include_file: true} diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl.core b/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl.core index 0c473f039719b..ba810697d8a3c 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl.core +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl.core @@ -2,16 +2,16 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_otp_ctrl:1.0 +name: lowrisc:darjeeling_ip:otp_ctrl:1.0 description: "OTP Controller" virtual: - - lowrisc:ip_interfaces:otp_ctrl + - lowrisc:virtual_ip:otp_ctrl filesets: files_rtl: depend: - lowrisc:ip:otp_ctrl_pkg - - lowrisc:opentitan:top_darjeeling_otp_ctrl_top_specific_pkg + - lowrisc:darjeeling_ip:otp_ctrl_top_specific_pkg - lowrisc:ip:tlul - lowrisc:prim:all - lowrisc:prim:ram_1p @@ -25,7 +25,7 @@ filesets: - lowrisc:prim:secded - lowrisc:prim:edn_req - lowrisc:prim:sec_anchor - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:darjeeling_ip:pwrmgr_pkg - lowrisc:ip:edn_pkg - lowrisc:prim:sparse_fsm - "fileset_partner ? (partner:systems:ast_pkg)" diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl_prim_reg_top.core b/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl_prim_reg_top.core index 817b3e74434c6..0ee457b560ea6 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl_prim_reg_top.core +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl_prim_reg_top.core @@ -10,7 +10,7 @@ filesets: # otp_ctrl_prim_reg_top.sv should depend on generic items for now. # This may change and will require reworking the flow to generate # the otp prim. - - lowrisc:ip_interfaces:otp_ctrl_top_specific_pkg + - lowrisc:virtual_ip:otp_ctrl_top_specific_pkg files: - rtl/otp_ctrl_prim_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl_top_specific_pkg.core b/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl_top_specific_pkg.core index 588bf79ed59c8..41f754ec6a836 100644 --- a/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl_top_specific_pkg.core +++ b/hw/top_darjeeling/ip_autogen/otp_ctrl/otp_ctrl_top_specific_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_otp_ctrl_top_specific_pkg:1.0 +name: lowrisc:darjeeling_ip:otp_ctrl_top_specific_pkg:1.0 description: "OTP Controller Top Specific Packages" virtual: - - lowrisc:ip_interfaces:otp_ctrl_top_specific_pkg + - lowrisc:virtual_ip:otp_ctrl_top_specific_pkg filesets: files_rtl: diff --git a/hw/top_darjeeling/ip_autogen/pinmux/data/top_darjeeling_pinmux.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/pinmux/data/top_darjeeling_pinmux.ipconfig.hjson index 2bd0979024081..19ed4ed280bc3 100644 --- a/hw/top_darjeeling/ip_autogen/pinmux/data/top_darjeeling_pinmux.ipconfig.hjson +++ b/hw/top_darjeeling/ip_autogen/pinmux/data/top_darjeeling_pinmux.ipconfig.hjson @@ -18,5 +18,12 @@ top_pkg_vlnv: lowrisc:constants:top_darjeeling_top_pkg scan_role_pkg_vlnv: lowrisc:systems:top_darjeeling_scan_role_pkg topname: darjeeling + uniquified_modules: + { + racl_ctrl: racl_ctrl + ac_range_check: ac_range_check + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core b/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core index 8481c32b4159f..8ad8439a78869 100644 --- a/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core +++ b/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pinmux_chip_fpv:0.1 +name: lowrisc:darjeeling_systems:pinmux_chip_fpv:0.1 description: "pinmux FPV target with chip_earlgrey parameters" filesets: @@ -13,9 +13,9 @@ filesets: - lowrisc:ip:jtag_pkg - lowrisc:prim:mubi_pkg - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_darjeeling_pinmux:0.1 + - lowrisc:darjeeling_ip:pinmux:0.1 - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_darjeeling_pinmux_common_fpv:0.1 + - lowrisc:darjeeling_fpv:pinmux_common_fpv:0.1 - lowrisc:constants:top_darjeeling_top_pkg - lowrisc:systems:top_darjeeling_scan_role_pkg files: diff --git a/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_common_fpv.core b/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_common_fpv.core index 0f5eb5506e3e8..346dc056b85ec 100644 --- a/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_common_fpv.core +++ b/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_common_fpv.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pinmux_common_fpv:0.1 +name: lowrisc:darjeeling_fpv:pinmux_common_fpv:0.1 description: "pinmux common FPV target" filesets: files_formal: depend: - lowrisc:prim:all - lowrisc:ip:tlul - - lowrisc:opentitan:top_darjeeling_pinmux:0.1 + - lowrisc:darjeeling_ip:pinmux:0.1 files: - vip/pinmux_assert_fpv.sv - tb/pinmux_bind_fpv.sv diff --git a/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_fpv.core b/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_fpv.core index 412ee2337fc39..09c35388e26ad 100644 --- a/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_fpv.core +++ b/hw/top_darjeeling/ip_autogen/pinmux/fpv/pinmux_fpv.core @@ -2,16 +2,16 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pinmux_fpv:0.1 +name: lowrisc:darjeeling_fpv:pinmux_fpv:0.1 description: "pinmux FPV target" filesets: files_formal: depend: - lowrisc:prim:all - lowrisc:ip:tlul - - lowrisc:opentitan:top_darjeeling_pinmux:0.1 + - lowrisc:darjeeling_ip:pinmux:0.1 - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_darjeeling_pinmux_common_fpv + - lowrisc:darjeeling_fpv:pinmux_common_fpv files: - tb/pinmux_tb.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/pinmux/pinmux.core b/hw/top_darjeeling/ip_autogen/pinmux/pinmux.core index 6f86ef4b1fb44..b4770c7ff7dd2 100644 --- a/hw/top_darjeeling/ip_autogen/pinmux/pinmux.core +++ b/hw/top_darjeeling/ip_autogen/pinmux/pinmux.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pinmux:0.1 +name: lowrisc:darjeeling_ip:pinmux:0.1 description: "Pin Multiplexer" filesets: @@ -19,8 +19,8 @@ filesets: - lowrisc:prim:pad_wrapper_pkg - lowrisc:prim:pad_attr - lowrisc:ip:jtag_pkg - - lowrisc:opentitan:top_darjeeling_pinmux_reg:0.1 - - lowrisc:opentitan:top_darjeeling_pinmux_pkg:0.1 + - lowrisc:darjeeling_ip:pinmux_reg:0.1 + - lowrisc:darjeeling_ip:pinmux_pkg:0.1 files: - rtl/pinmux_wkup.sv - rtl/pinmux_jtag_buf.sv diff --git a/hw/top_darjeeling/ip_autogen/pinmux/pinmux_pkg.core b/hw/top_darjeeling/ip_autogen/pinmux/pinmux_pkg.core index 50e8fb88cde4c..59d014471bea0 100644 --- a/hw/top_darjeeling/ip_autogen/pinmux/pinmux_pkg.core +++ b/hw/top_darjeeling/ip_autogen/pinmux/pinmux_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pinmux_pkg:0.1 +name: lowrisc:darjeeling_ip:pinmux_pkg:0.1 description: "Pinmux package" virtual: - - lowrisc:ip_interfaces:pinmux_pkg + - lowrisc:virtual_ip:pinmux_pkg filesets: files_rtl: diff --git a/hw/top_darjeeling/ip_autogen/pinmux/pinmux_reg.core b/hw/top_darjeeling/ip_autogen/pinmux/pinmux_reg.core index 05e3471f19a8b..e9f1804765079 100644 --- a/hw/top_darjeeling/ip_autogen/pinmux/pinmux_reg.core +++ b/hw/top_darjeeling/ip_autogen/pinmux/pinmux_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pinmux_reg:0.1 +name: lowrisc:darjeeling_ip:pinmux_reg:0.1 description: "Auto-generated pinmux register sources" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:ip:tlul - lowrisc:prim:subreg - - lowrisc:opentitan:top_darjeeling_pinmux_pkg + - lowrisc:darjeeling_ip:pinmux_pkg files: - rtl/pinmux_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson b/hw/top_darjeeling/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson index 2d9b5a6997bcd..fc0d9495bb0d7 100644 --- a/hw/top_darjeeling/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson +++ b/hw/top_darjeeling/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson @@ -6,7 +6,7 @@ name: pinmux // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_darjeeling_pinmux:0.1 + fusesoc_core: lowrisc:darjeeling_ip:pinmux:0.1 import_cfgs: [// Project wide common synthesis config file "{proj_root}/hw/syn/tools/dvsim/common_syn_cfg.hjson"], diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/data/top_darjeeling_pwrmgr.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/pwrmgr/data/top_darjeeling_pwrmgr.ipconfig.hjson index c066abdcffbe8..8a090fe2efe0a 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/data/top_darjeeling_pwrmgr.ipconfig.hjson +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/data/top_darjeeling_pwrmgr.ipconfig.hjson @@ -73,5 +73,12 @@ NumRomInputs: 3 top_pkg_vlnv: lowrisc:constants:top_darjeeling_top_pkg topname: darjeeling + uniquified_modules: + { + racl_ctrl: racl_ctrl + ac_range_check: ac_range_check + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core index 68f5aa515deec..77d92eba6aa10 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pwrmgr_env:0.1 +name: lowrisc:darjeeling_dv:pwrmgr_env:0.1 description: "PWRMGR DV UVM environment" filesets: files_dv: @@ -10,7 +10,7 @@ filesets: - lowrisc:dv:ralgen - lowrisc:dv:cip_lib - lowrisc:ip:rv_core_ibex_pkg - - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg + - lowrisc:darjeeling_ip:pwrmgr_pkg - lowrisc:constants:top_darjeeling_top_pkg files: - pwrmgr_env_pkg.sv diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/pwrmgr_sim.core b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/pwrmgr_sim.core index cc4481f03a9f7..3c6af8dce5413 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/pwrmgr_sim.core +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/pwrmgr_sim.core @@ -2,17 +2,17 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pwrmgr_sim:0.1 +name: lowrisc:darjeeling_dv:pwrmgr_sim:0.1 description: "PWRMGR DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_pwrmgr:0.1 + - lowrisc:darjeeling_ip:pwrmgr:0.1 files_dv: depend: - - lowrisc:opentitan:top_darjeeling_pwrmgr_test:0.1 - - lowrisc:opentitan:top_darjeeling_pwrmgr_sva:0.1 - - lowrisc:opentitan:top_darjeeling_pwrmgr_unit_only_sva:0.1 + - lowrisc:darjeeling_dv:pwrmgr_test:0.1 + - lowrisc:darjeeling_dv:pwrmgr_sva:0.1 + - lowrisc:darjeeling_dv:pwrmgr_unit_only_sva:0.1 files: - tb.sv - cov/pwrmgr_cov_bind.sv diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson index 60657a8f33975..8ebd504a4e6fa 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_darjeeling_pwrmgr_sim:0.1 + fusesoc_core: lowrisc:darjeeling_dv:pwrmgr_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/pwrmgr_testplan.hjson" diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core index 920dadae2a69c..f212ad89fa718 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pwrmgr_sva:0.1 +name: lowrisc:darjeeling_dv:pwrmgr_sva:0.1 description: "PWRMGR assertion modules and bind file." filesets: files_dv: @@ -11,7 +11,7 @@ filesets: - lowrisc:fpv:csr_assert_gen - lowrisc:dv:clkmgr_pwrmgr_sva_if - lowrisc:dv:pwrmgr_rstmgr_sva_if:0.1 - - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg + - lowrisc:darjeeling_ip:pwrmgr_pkg files: - pwrmgr_bind.sv - pwrmgr_clock_enables_sva_if.sv @@ -21,7 +21,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_darjeeling_pwrmgr:0.1 + - lowrisc:darjeeling_ip:pwrmgr:0.1 generate: csr_assert_gen: diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core index b20f173e7c8a2..3aa931e35c0ca 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pwrmgr_unit_only_sva:0.1 +name: lowrisc:darjeeling_dv:pwrmgr_unit_only_sva:0.1 description: "PWRMGR assertion interfaces not suitable for chip level bind file." filesets: files_dv: @@ -10,8 +10,8 @@ filesets: - lowrisc:tlul:headers - lowrisc:fpv:csr_assert_gen - lowrisc:dv:pwrmgr_rstmgr_sva_if - - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg:0.1 - - lowrisc:opentitan:top_darjeeling_pwrmgr:0.1 + - lowrisc:darjeeling_ip:pwrmgr_pkg:0.1 + - lowrisc:darjeeling_ip:pwrmgr:0.1 files: - pwrmgr_unit_only_bind.sv diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core index 4fa456555abb9..5b9e6b8745441 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pwrmgr_test:0.1 +name: lowrisc:darjeeling_dv:pwrmgr_test:0.1 description: "PWRMGR DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_darjeeling_pwrmgr_env:0.1 + - lowrisc:darjeeling_dv:pwrmgr_env:0.1 files: - pwrmgr_test_pkg.sv - pwrmgr_base_test.sv: {is_include_file: true} diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr.core b/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr.core index ae10730668b8b..8a3392b2741d6 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr.core +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pwrmgr:0.1 +name: lowrisc:darjeeling_ip:pwrmgr:0.1 description: "Power manager RTL" filesets: @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:mubi - lowrisc:prim:clock_buf - lowrisc:prim:measure - - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg:0.1 - - lowrisc:opentitan:top_darjeeling_pwrmgr_reg:0.1 + - lowrisc:darjeeling_ip:pwrmgr_pkg:0.1 + - lowrisc:darjeeling_ip:pwrmgr_reg:0.1 files: - rtl/pwrmgr_cdc.sv - rtl/pwrmgr_slow_fsm.sv diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr_pkg.core b/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr_pkg.core index fd3c59f6873fc..16569e63f0b20 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr_pkg.core +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pwrmgr_pkg:0.1 +name: lowrisc:darjeeling_ip:pwrmgr_pkg:0.1 description: "Power manager package" virtual: - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:virtual_ip:pwrmgr_pkg filesets: files_rtl: diff --git a/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr_reg.core b/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr_reg.core index 83472080a4066..43361a3118b21 100644 --- a/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr_reg.core +++ b/hw/top_darjeeling/ip_autogen/pwrmgr/pwrmgr_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_pwrmgr_reg:0.1 +name: lowrisc:darjeeling_ip:pwrmgr_reg:0.1 description: "Power manager registers" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:ip:tlul - lowrisc:prim:subreg - - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg + - lowrisc:darjeeling_ip:pwrmgr_pkg files: - rtl/pwrmgr_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/racl_ctrl/data/top_darjeeling_racl_ctrl.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/racl_ctrl/data/top_darjeeling_racl_ctrl.ipconfig.hjson index 1493c228b9943..ca706d8c37e49 100644 --- a/hw/top_darjeeling/ip_autogen/racl_ctrl/data/top_darjeeling_racl_ctrl.ipconfig.hjson +++ b/hw/top_darjeeling/ip_autogen/racl_ctrl/data/top_darjeeling_racl_ctrl.ipconfig.hjson @@ -63,5 +63,12 @@ } ] topname: darjeeling + uniquified_modules: + { + racl_ctrl: racl_ctrl + ac_range_check: ac_range_check + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_darjeeling/ip_autogen/racl_ctrl/racl_ctrl.core b/hw/top_darjeeling/ip_autogen/racl_ctrl/racl_ctrl.core index d4c8ffa94b2fb..be49f01b8ef53 100644 --- a/hw/top_darjeeling/ip_autogen/racl_ctrl/racl_ctrl.core +++ b/hw/top_darjeeling/ip_autogen/racl_ctrl/racl_ctrl.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_racl_ctrl:0.1 +name: lowrisc:darjeeling_ip:racl_ctrl:0.1 description: "RACL Control permission IP" filesets: diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/data/top_darjeeling_rstmgr.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/rstmgr/data/top_darjeeling_rstmgr.ipconfig.hjson index 564ddc31b3428..54db4d01553ab 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/data/top_darjeeling_rstmgr.ipconfig.hjson +++ b/hw/top_darjeeling/ip_autogen/rstmgr/data/top_darjeeling_rstmgr.ipconfig.hjson @@ -548,5 +548,12 @@ pwrmgr_vlnv_prefix: top_darjeeling_ top_pkg_vlnv: lowrisc:constants:top_darjeeling_top_pkg topname: darjeeling + uniquified_modules: + { + racl_ctrl: racl_ctrl + ac_range_check: ac_range_check + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/dv/env/rstmgr_env.core b/hw/top_darjeeling/ip_autogen/rstmgr/dv/env/rstmgr_env.core index e45ad60ca3001..1e9ef8243a5e8 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/dv/env/rstmgr_env.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/dv/env/rstmgr_env.core @@ -2,18 +2,18 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr_env:0.1 +name: lowrisc:darjeeling_dv:rstmgr_env:0.1 description: "RSTMGR DV UVM environment" filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_rstmgr + - lowrisc:darjeeling_ip:rstmgr files_dv: depend: - lowrisc:dv:ralgen - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_darjeeling_rstmgr_pkg + - lowrisc:darjeeling_ip:rstmgr_pkg - lowrisc:constants:top_darjeeling_top_pkg files: diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core b/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core index bf67489028e83..9d92434898d79 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr_cnsty_chk_sim:0.1 +name: lowrisc:darjeeling_dv:rstmgr_cnsty_chk_sim:0.1 description: "Rstmgr_cnsty_chk DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_rstmgr_cnsty_chk:0.1 + - lowrisc:darjeeling_ip:rstmgr_cnsty_chk:0.1 - lowrisc:dv:sec_cm file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson b/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson index aaac05ffcc085..f84d7f11d5dc2 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson +++ b/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_darjeeling_rstmgr_cnsty_chk_sim:0.1 + fusesoc_core: lowrisc:darjeeling_dv:rstmgr_cnsty_chk_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/data/rstmgr_cnsty_chk_testplan.hjson" diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_sim.core b/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_sim.core index 0e7b8ec8e1e50..7d4b224202fe7 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_sim.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_sim.core @@ -2,17 +2,17 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr_sim:0.1 +name: lowrisc:darjeeling_dv:rstmgr_sim:0.1 description: "RSTMGR DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_rstmgr + - lowrisc:darjeeling_ip:rstmgr files_dv: depend: - - lowrisc:opentitan:top_darjeeling_rstmgr_test:0.1 - - lowrisc:opentitan:top_darjeeling_rstmgr_sva:0.1 + - lowrisc:darjeeling_dv:rstmgr_test:0.1 + - lowrisc:darjeeling_dv:rstmgr_sva:0.1 files: - tb.sv - cov/rstmgr_cov_bind.sv diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson b/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson index d701389870a6d..3f3833c6d7ef9 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson +++ b/hw/top_darjeeling/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_darjeeling_rstmgr_sim:0.1 + fusesoc_core: lowrisc:darjeeling_dv:rstmgr_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/rstmgr_testplan.hjson" diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core b/hw/top_darjeeling/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core index 3ddfd7c7c2dcf..eef611913b6bd 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr_sva:0.1 +name: lowrisc:darjeeling_dv:rstmgr_sva:0.1 description: "RSTMGR assertion modules and bind file." filesets: files_dv: depend: - lowrisc:prim:mubi - - lowrisc:opentitan:top_darjeeling_rstmgr_pkg:0.1 + - lowrisc:darjeeling_ip:rstmgr_pkg:0.1 - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_darjeeling_rstmgr_sva_ifs:0.1 + - lowrisc:darjeeling_dv:rstmgr_sva_ifs:0.1 files: - rstmgr_bind.sv diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core b/hw/top_darjeeling/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core index 0797032717cff..dc790bfd3d2e3 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr_sva_ifs:0.1 +name: lowrisc:darjeeling_dv:rstmgr_sva_ifs:0.1 description: "RSTMGR cascading resets assertion interface." filesets: files_dv: depend: - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg + - lowrisc:darjeeling_ip:pwrmgr_pkg - lowrisc:dv:pwrmgr_rstmgr_sva_if - - lowrisc:opentitan:top_darjeeling_rstmgr + - lowrisc:darjeeling_ip:rstmgr files: - rstmgr_attrs_sva_if.sv diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/dv/tests/rstmgr_test.core b/hw/top_darjeeling/ip_autogen/rstmgr/dv/tests/rstmgr_test.core index b81544560eea3..8bbd4f682644b 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/dv/tests/rstmgr_test.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/dv/tests/rstmgr_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr_test:0.1 +name: lowrisc:darjeeling_dv:rstmgr_test:0.1 description: "RSTMGR DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_darjeeling_rstmgr_env:0.1 + - lowrisc:darjeeling_dv:rstmgr_env:0.1 files: - rstmgr_test_pkg.sv - rstmgr_base_test.sv: {is_include_file: true} diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr.core b/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr.core index 6979799118675..a952bff0f69b5 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr:0.1 +name: lowrisc:darjeeling_ip:rstmgr:0.1 description: "Reset manager RTL" filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_alert_handler_pkg + - lowrisc:darjeeling_ip:alert_handler_pkg - lowrisc:ip:rv_core_ibex_pkg - lowrisc:ip:tlul - lowrisc:prim:clock_mux2 @@ -17,9 +17,9 @@ filesets: - lowrisc:prim:mubi - lowrisc:prim:clock_buf - lowrisc:prim:sparse_fsm - - lowrisc:opentitan:top_darjeeling_rstmgr_pkg:0.1 - - lowrisc:opentitan:top_darjeeling_rstmgr_reg:0.1 - - lowrisc:opentitan:top_darjeeling_rstmgr_cnsty_chk:0.1 + - lowrisc:darjeeling_ip:rstmgr_pkg:0.1 + - lowrisc:darjeeling_ip:rstmgr_reg:0.1 + - lowrisc:darjeeling_ip:rstmgr_cnsty_chk:0.1 files: - rtl/rstmgr_ctrl.sv - rtl/rstmgr_por.sv diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_cnsty_chk.core b/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_cnsty_chk.core index 8186678a0c07e..c3f5fa0c4af64 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_cnsty_chk.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_cnsty_chk.core @@ -3,7 +3,7 @@ CAPI=2: # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr_cnsty_chk:0.1 +name: lowrisc:darjeeling_ip:rstmgr_cnsty_chk:0.1 description: "Rstmgr consistency checker" filesets: files_rtl: @@ -11,7 +11,7 @@ filesets: - lowrisc:prim:all - lowrisc:prim:sparse_fsm - lowrisc:ip:rv_core_ibex_pkg - - lowrisc:opentitan:top_darjeeling_rstmgr_pkg + - lowrisc:darjeeling_ip:rstmgr_pkg files: - rtl/rstmgr_cnsty_chk.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_pkg.core b/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_pkg.core index bcfcee8c4122c..dac7188cffd9b 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_pkg.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_pkg.core @@ -2,15 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr_pkg:0.1 +name: lowrisc:darjeeling_ip:rstmgr_pkg:0.1 description: "Reset manager package" -virtual: - - lowrisc:ip_interfaces:rstmgr_pkg filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_pwrmgr_pkg + - lowrisc:darjeeling_ip:pwrmgr_pkg files: - rtl/rstmgr_reg_pkg.sv - rtl/rstmgr_pkg.sv diff --git a/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_reg.core b/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_reg.core index f8bc691ac0113..430fb07e45556 100644 --- a/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_reg.core +++ b/hw/top_darjeeling/ip_autogen/rstmgr/rstmgr_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rstmgr_reg:0.1 +name: lowrisc:darjeeling_ip:rstmgr_reg:0.1 description: "Reset manager registers" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:tlul:headers - lowrisc:prim:subreg - - lowrisc:opentitan:top_darjeeling_rstmgr_pkg + - lowrisc:darjeeling_ip:rstmgr_pkg files: - rtl/rstmgr_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_darjeeling/ip_autogen/rv_plic/data/top_darjeeling_rv_plic.ipconfig.hjson b/hw/top_darjeeling/ip_autogen/rv_plic/data/top_darjeeling_rv_plic.ipconfig.hjson index 2b140c6175bee..f9b83c9312bdb 100644 --- a/hw/top_darjeeling/ip_autogen/rv_plic/data/top_darjeeling_rv_plic.ipconfig.hjson +++ b/hw/top_darjeeling/ip_autogen/rv_plic/data/top_darjeeling_rv_plic.ipconfig.hjson @@ -10,5 +10,12 @@ target: 1 prio: 3 topname: darjeeling + uniquified_modules: + { + racl_ctrl: racl_ctrl + ac_range_check: ac_range_check + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_darjeeling/ip_autogen/rv_plic/fpv/rv_plic_fpv.core b/hw/top_darjeeling/ip_autogen/rv_plic/fpv/rv_plic_fpv.core index 7d7642b5d1ea5..1c376f6945d05 100644 --- a/hw/top_darjeeling/ip_autogen/rv_plic/fpv/rv_plic_fpv.core +++ b/hw/top_darjeeling/ip_autogen/rv_plic/fpv/rv_plic_fpv.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rv_plic_fpv:0.1 +name: lowrisc:darjeeling_ip:rv_plic_fpv:0.1 description: "FPV for RISC-V PLIC" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:ip:tlul - lowrisc:prim:all - - lowrisc:opentitan:top_darjeeling_rv_plic + - lowrisc:darjeeling_ip:rv_plic - lowrisc:fpv:csr_assert_gen files: - tb/rv_plic_bind_fpv.sv @@ -24,7 +24,7 @@ generate: generator: csr_assert_gen parameters: spec: ../data/rv_plic.hjson - depend: lowrisc:opentitan:top_darjeeling_rv_plic + depend: lowrisc:darjeeling_ip:rv_plic targets: default: &default_target diff --git a/hw/top_darjeeling/ip_autogen/rv_plic/rv_plic.core b/hw/top_darjeeling/ip_autogen/rv_plic/rv_plic.core index 2fe1866969f21..558115572bcbd 100644 --- a/hw/top_darjeeling/ip_autogen/rv_plic/rv_plic.core +++ b/hw/top_darjeeling/ip_autogen/rv_plic/rv_plic.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rv_plic:0.1 +name: lowrisc:darjeeling_ip:rv_plic:0.1 description: "RISC-V Platform Interrupt Controller (PLIC)" filesets: files_rtl: depend: - - lowrisc:opentitan:top_darjeeling_rv_plic_component:0.1 + - lowrisc:darjeeling_ip:rv_plic_component:0.1 - lowrisc:ip:tlul - lowrisc:prim:subreg files: diff --git a/hw/top_darjeeling/ip_autogen/rv_plic/rv_plic_component.core b/hw/top_darjeeling/ip_autogen/rv_plic/rv_plic_component.core index 9c7b854a2b22b..065ed4b45c816 100644 --- a/hw/top_darjeeling/ip_autogen/rv_plic/rv_plic_component.core +++ b/hw/top_darjeeling/ip_autogen/rv_plic/rv_plic_component.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_darjeeling_rv_plic_component:0.1 +name: lowrisc:darjeeling_ip:rv_plic_component:0.1 description: "RISC-V Platform Interrupt Controller (PLIC)" filesets: diff --git a/hw/top_earlgrey/dv/chip_sim.core b/hw/top_earlgrey/dv/chip_sim.core index 9e3839f4a0c08..cc75150207508 100644 --- a/hw/top_earlgrey/dv/chip_sim.core +++ b/hw/top_earlgrey/dv/chip_sim.core @@ -19,13 +19,13 @@ filesets: files_dv: depend: # Place the autogen packages first to avoid conflicts - - lowrisc:opentitan:top_earlgrey_alert_handler_reg - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg + - lowrisc:earlgrey_ip:alert_handler_reg + - lowrisc:earlgrey_ip:pwrmgr_pkg - lowrisc:ip:tlul - lowrisc:dv:top_earlgrey_chip_test - - lowrisc:opentitan:top_earlgrey_clkmgr_sva - - lowrisc:opentitan:top_earlgrey_pwrmgr_sva - - lowrisc:opentitan:top_earlgrey_rstmgr_sva + - lowrisc:earlgrey_dv:clkmgr_sva + - lowrisc:earlgrey_dv:pwrmgr_sva + - lowrisc:earlgrey_dv:rstmgr_sva - lowrisc:dv:top_earlgrey_sva - lowrisc:dv:top_earlgrey_xbar_main_bind - lowrisc:dv:top_earlgrey_xbar_peri_bind @@ -34,7 +34,7 @@ filesets: - lowrisc:dv:sim_sram - lowrisc:dv:sw_test_status - lowrisc:dv:sw_logger_if - - lowrisc:opentitan:top_earlgrey_flash_ctrl_bkdr_util + - lowrisc:earlgrey_dv:flash_ctrl_bkdr_util - lowrisc:dv:rom_ctrl_bkdr_util - lowrisc:dv:sram_ctrl_bkdr_util - lowrisc:dv_dpi_c:gpiodpi diff --git a/hw/top_earlgrey/dv/env/chip_env.core b/hw/top_earlgrey/dv/env/chip_env.core index 2316318692c98..3ea0c6a81de89 100644 --- a/hw/top_earlgrey/dv/env/chip_env.core +++ b/hw/top_earlgrey/dv/env/chip_env.core @@ -23,8 +23,8 @@ filesets: - lowrisc:dv:jtag_riscv_agent - lowrisc:dv:jtag_dmi_agent - lowrisc:dv:lc_ctrl_dv_utils - - lowrisc:opentitan:top_earlgrey_flash_ctrl_bkdr_util - - lowrisc:opentitan:top_earlgrey_otp_ctrl_mem_bkdr_util + - lowrisc:earlgrey_dv:flash_ctrl_bkdr_util + - lowrisc:earlgrey_dv:otp_ctrl_mem_bkdr_util - lowrisc:dv:ralgen - lowrisc:dv:spi_agent - lowrisc:dv:spi_host_sva @@ -36,7 +36,7 @@ filesets: - lowrisc:dv:i2c_agent - lowrisc:dv:pattgen_agent - lowrisc:ip:otp_ctrl_pkg - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg - lowrisc:dv:lc_ctrl_dv_utils - "!fileset_partner ? (lowrisc:systems:top_earlgrey_ast_pkg)" - "fileset_partner ? (partner:systems:top_earlgrey_ast_pkg)" diff --git a/hw/top_earlgrey/dv/sva/top_earlgrey_sva.core b/hw/top_earlgrey/dv/sva/top_earlgrey_sva.core index 8ca603291e7b7..5c63e4e382ad1 100644 --- a/hw/top_earlgrey/dv/sva/top_earlgrey_sva.core +++ b/hw/top_earlgrey/dv/sva/top_earlgrey_sva.core @@ -7,7 +7,7 @@ description: "TOP_EARLGREY assertion modules and bind file." filesets: files_dv: depend: - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg - lowrisc:prim:assert - lowrisc:systems:top_earlgrey files: diff --git a/hw/top_earlgrey/formal/top_earlgrey_fpv_sec_cm_cfgs.hjson b/hw/top_earlgrey/formal/top_earlgrey_fpv_sec_cm_cfgs.hjson index eff7e9d11d589..f32b569f5e083 100644 --- a/hw/top_earlgrey/formal/top_earlgrey_fpv_sec_cm_cfgs.hjson +++ b/hw/top_earlgrey/formal/top_earlgrey_fpv_sec_cm_cfgs.hjson @@ -44,7 +44,7 @@ { name: alert_handler_sec_cm dut: alert_handler - fusesoc_core: lowrisc:opentitan:top_earlgrey_alert_handler_sva + fusesoc_core: lowrisc:earlgrey_dv:alert_handler_sva import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] rel_path: "hw/top_earlgrey/ip_autogen/alert_handler/{sub_flow}/{tool}" stopats: ["*u_state_regs.state_o"] @@ -53,7 +53,7 @@ { name: clkmgr_sec_cm dut: clkmgr - fusesoc_core: lowrisc:dv:clkmgr_sva + fusesoc_core: lowrisc:earlgrey_dv:clkmgr_sva import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] rel_path: "hw/top_earlgrey/ip_autogen/clkmgr/{sub_flow}/{tool}" task: "FpvSecCm" @@ -88,7 +88,7 @@ { name: flash_ctrl_sec_cm dut: flash_ctrl - fusesoc_core: lowrisc:dv:flash_ctrl_sva + fusesoc_core: lowrisc:earlgrey_dv:flash_ctrl_sva import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] rel_path: "hw/top_earlgrey/ip_autogen/flash_ctrl/{sub_flow}/{tool}" overrides: [ @@ -133,7 +133,7 @@ { name: otp_ctrl_sec_cm dut: otp_ctrl - fusesoc_core: lowrisc:opentitan:top_earlgrey_otp_ctrl_sva + fusesoc_core: earlgrey_dv:otp_ctrl_sva import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] rel_path: "hw/top_earlgrey/ip_autogen/otp_ctrl/{sub_flow}/{tool}" stopats: ["*u_state_regs.state_o"] @@ -151,7 +151,7 @@ { name: pwrmgr_sec_cm dut: pwrmgr - fusesoc_core: lowrisc:dv:pwrmgr_sva + fusesoc_core: lowrisc:earlgrey_dv:pwrmgr_sva import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] rel_path: "hw/top_earlgrey/ip_autogen/pwrmgr/{sub_flow}/{tool}" overrides: [ @@ -175,7 +175,7 @@ { name: rstmgr_sec_cm dut: rstmgr - fusesoc_core: lowrisc:dv:rstmgr_sva + fusesoc_core: lowrisc:earlgrey_dv:rstmgr_sva import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] rel_path: "hw/top_earlgrey/ip_autogen/rstmgr/{sub_flow}/{tool}" overrides: [ @@ -215,7 +215,7 @@ { name: pinmux_sec_cm dut: pinmux - fusesoc_core: lowrisc:ip_interfaces:pinmux + fusesoc_core: lowrisc:earlgrey_ip:pinmux import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] rel_path: "hw/top_earlgrey/ip_autogen/pinmux/{sub_flow}/{tool}/sec_cm" task: "FpvSecCm" @@ -229,7 +229,7 @@ { name: rv_plic_sec_cm dut: rv_plic - fusesoc_core: lowrisc:opentitan:top_earlgrey_rv_plic_fpv + fusesoc_core: lowrisc:earlgrey_ip:rv_plic_fpv import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] rel_path: "hw/top_earlgrey/ip/rv_plic/{sub_flow}/{tool}/sec_cm" task: "FpvSecCm" @@ -279,7 +279,7 @@ { name: pwrmgr_esc_unstoppable dut: pwrmgr - fusesoc_core: lowrisc:dv:pwrmgr_sva + fusesoc_core: lowrisc:earlgrey_dv:pwrmgr_sva import_cfgs: ["{proj_root}/hw/formal/tools/dvsim/common_fpv_cfg.hjson"] rel_path: "hw/top_earlgrey/ip_autogen/pwrmgr/{sub_flow}/{tool}" overrides: [ diff --git a/hw/top_earlgrey/ip/ast/ast.core b/hw/top_earlgrey/ip/ast/ast.core index 0ed5ea779adb7..5ee98733a48ee 100644 --- a/hw/top_earlgrey/ip/ast/ast.core +++ b/hw/top_earlgrey/ip/ast/ast.core @@ -16,16 +16,16 @@ filesets: - lowrisc:prim:clock_inv - lowrisc:prim:lc_dec - lowrisc:prim:lfsr - - lowrisc:ip_interfaces:pinmux_pkg + - lowrisc:earlgrey_ip:pinmux_pkg - lowrisc:prim:assert - lowrisc:prim:prim_pkg - lowrisc:prim:mubi - lowrisc:prim:multibit_sync - lowrisc:ip:lc_ctrl_pkg - lowrisc:ip:edn_pkg - - lowrisc:ip_interfaces:alert_handler_pkg - - lowrisc:ip_interfaces:clkmgr_pkg - - lowrisc:ip_interfaces:rstmgr_pkg + - lowrisc:earlgrey_ip:alert_handler_pkg + - lowrisc:earlgrey_ip:clkmgr_pkg + - lowrisc:earlgrey_ip:rstmgr_pkg - lowrisc:systems:top_earlgrey_ast_pkg files: - rtl/ast_reg_pkg.sv diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler.core b/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler.core index bc2d70470bd39..cfc0521f2ebb5 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler:0.1 +name: lowrisc:earlgrey_ip:alert_handler:0.1 description: "Alert Handler" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_alert_handler_component:0.1 - - lowrisc:opentitan:top_earlgrey_alert_handler_reg:0.1 + - lowrisc:earlgrey_ip:alert_handler_component:0.1 + - lowrisc:earlgrey_ip:alert_handler_reg:0.1 file_type: systemVerilogSource parameters: diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_component.core b/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_component.core index eace4207b00b3..cd61deb1998ef 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_component.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_component.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_component:0.1 +name: lowrisc:earlgrey_ip:alert_handler_component:0.1 description: "Alert Handler component without the CSRs" filesets: @@ -17,7 +17,7 @@ filesets: - lowrisc:prim:buf - lowrisc:prim:mubi - lowrisc:prim:sparse_fsm - - lowrisc:opentitan:top_earlgrey_alert_handler_reg + - lowrisc:earlgrey_ip:alert_handler_reg files: - rtl/alert_handler_reg_wrap.sv - rtl/alert_handler_lpg_ctrl.sv diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_pkg.core b/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_pkg.core index f0c28a846c16c..00f88a91fed1a 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_pkg.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_pkg:0.1 +name: lowrisc:earlgrey_ip:alert_handler_pkg:0.1 description: "Alert Handler constants in packages" virtual: - - "lowrisc:ip_interfaces:alert_handler_pkg" + - "lowrisc:virtual_ip:alert_handler_pkg" filesets: files_rtl: diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_reg.core b/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_reg.core index e92d9d20dd904..e2c4841c66e8c 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_reg.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/alert_handler_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_reg:0.1 +name: lowrisc:earlgrey_ip:alert_handler_reg:0.1 description: "Auto-generated alert handler register sources" filesets: @@ -11,7 +11,7 @@ filesets: - lowrisc:prim:subreg - lowrisc:ip:tlul - lowrisc:prim:subreg - - lowrisc:opentitan:top_earlgrey_alert_handler_pkg + - lowrisc:earlgrey_ip:alert_handler_pkg files: - rtl/alert_handler_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson index ac68ba9f521a2..7c96d1d362e2e 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson +++ b/hw/top_earlgrey/ip_autogen/alert_handler/data/top_earlgrey_alert_handler.ipconfig.hjson @@ -149,5 +149,10 @@ ] top_pkg_vlnv: lowrisc:constants:top_earlgrey_top_pkg topname: earlgrey + uniquified_modules: + { + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/dv/alert_handler_sim.core b/hw/top_earlgrey/ip_autogen/alert_handler/dv/alert_handler_sim.core index 3fcb58c848f13..e0d3dc57d468e 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/dv/alert_handler_sim.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/dv/alert_handler_sim.core @@ -2,20 +2,20 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_sim:0.1 +name: lowrisc:earlgrey_dv:alert_handler_sim:0.1 description: "ALERT_HANDLER DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_alert_handler:0.1 + - lowrisc:earlgrey_ip:alert_handler:0.1 file_type: systemVerilogSource files_dv: depend: - lowrisc:dv:ralgen - - lowrisc:opentitan:top_earlgrey_alert_handler_tb:0.1 - - lowrisc:opentitan:top_earlgrey_alert_handler_cov:0.1 - - lowrisc:opentitan:top_earlgrey_alert_handler_sva:0.1 + - lowrisc:earlgrey_dv:alert_handler_tb:0.1 + - lowrisc:earlgrey_dv:alert_handler_cov:0.1 + - lowrisc:earlgrey_dv:alert_handler_sva:0.1 file_type: systemVerilogSource generate: diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson b/hw/top_earlgrey/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson index 863a94a81488e..0b23046044eeb 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson +++ b/hw/top_earlgrey/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_earlgrey_alert_handler_sim:0.1 + fusesoc_core: lowrisc:earlgrey_dv:alert_handler_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/alert_handler_testplan.hjson" diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/dv/cov/alert_handler_cov.core b/hw/top_earlgrey/ip_autogen/alert_handler/dv/cov/alert_handler_cov.core index af24583182205..d973c5dd1497d 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/dv/cov/alert_handler_cov.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/dv/cov/alert_handler_cov.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_cov:0.1 +name: lowrisc:earlgrey_dv:alert_handler_cov:0.1 description: "ALERT_HANDLER cov bind files" filesets: files_dv: depend: - - lowrisc:opentitan:top_earlgrey_alert_handler_component:0.1 # import alert_handler_pkg + - lowrisc:earlgrey_ip:alert_handler_component:0.1 # import alert_handler_pkg - lowrisc:dv:dv_utils files: - alert_handler_cov_bind.sv diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/dv/env/alert_handler_env.core b/hw/top_earlgrey/ip_autogen/alert_handler/dv/env/alert_handler_env.core index 753ff05d74774..f96b140bb9bb2 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/dv/env/alert_handler_env.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/dv/env/alert_handler_env.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_env:0.1 +name: lowrisc:earlgrey_dv:alert_handler_env:0.1 description: "ALERT_HANDLER DV UVM environment" filesets: files_dv: depend: - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_earlgrey_alert_handler_pkg:0.1 + - lowrisc:earlgrey_ip:alert_handler_pkg:0.1 - lowrisc:prim:mubi_pkg - lowrisc:constants:top_earlgrey_top_pkg files: diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/dv/sva/alert_handler_sva.core b/hw/top_earlgrey/ip_autogen/alert_handler/dv/sva/alert_handler_sva.core index 17aee39782129..352c0162045d4 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/dv/sva/alert_handler_sva.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/dv/sva/alert_handler_sva.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_sva:0.1 +name: lowrisc:earlgrey_dv:alert_handler_sva:0.1 description: "ALERT_HANDLER assertion modules and bind file." filesets: files_dv: @@ -15,7 +15,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_earlgrey_alert_handler:0.1 + - lowrisc:earlgrey_ip:alert_handler:0.1 generate: csr_assert_gen: diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/dv/tb/alert_handler_tb.core b/hw/top_earlgrey/ip_autogen/alert_handler/dv/tb/alert_handler_tb.core index f7b971a049585..8b2307cb5cda5 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/dv/tb/alert_handler_tb.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/dv/tb/alert_handler_tb.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_tb:0.1 +name: lowrisc:earlgrey_dv:alert_handler_tb:0.1 description: "ALERT_HANDLER UVM TB environment" filesets: files_dv: depend: - - lowrisc:opentitan:top_earlgrey_alert_handler_test:0.1 + - lowrisc:earlgrey_dv:alert_handler_test:0.1 files: - tb.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/dv/tests/alert_handler_test.core b/hw/top_earlgrey/ip_autogen/alert_handler/dv/tests/alert_handler_test.core index 61ed9bb86d3b8..18979cd46dd9d 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/dv/tests/alert_handler_test.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/dv/tests/alert_handler_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_test:0.1 +name: lowrisc:earlgrey_dv:alert_handler_test:0.1 description: "ALERT_HANDLER DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_earlgrey_alert_handler_env + - lowrisc:earlgrey_dv:alert_handler_env files: - alert_handler_test_pkg.sv - alert_handler_base_test.sv: {is_include_file: true} diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/fpv/alert_handler_esc_timer_fpv.core b/hw/top_earlgrey/ip_autogen/alert_handler/fpv/alert_handler_esc_timer_fpv.core index abdcd1f4cfd63..fee6b7f3be6b8 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/fpv/alert_handler_esc_timer_fpv.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/fpv/alert_handler_esc_timer_fpv.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_esc_timer_fpv:0.1 +name: lowrisc:earlgrey_fpv:alert_handler_esc_timer_fpv:0.1 description: "alert_handler_esc_timer FPV target" filesets: files_formal: depend: - lowrisc:prim:all - - lowrisc:opentitan:top_earlgrey_alert_handler + - lowrisc:earlgrey_ip:alert_handler files: - vip/alert_handler_esc_timer_assert_fpv.sv - tb/alert_handler_esc_timer_bind_fpv.sv diff --git a/hw/top_earlgrey/ip_autogen/alert_handler/fpv/alert_handler_ping_timer_fpv.core b/hw/top_earlgrey/ip_autogen/alert_handler/fpv/alert_handler_ping_timer_fpv.core index 354bd11a23cc3..899f01196b94f 100644 --- a/hw/top_earlgrey/ip_autogen/alert_handler/fpv/alert_handler_ping_timer_fpv.core +++ b/hw/top_earlgrey/ip_autogen/alert_handler/fpv/alert_handler_ping_timer_fpv.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_alert_handler_ping_timer_fpv:0.1 +name: lowrisc:earlgrey_fpv:alert_handler_ping_timer_fpv:0.1 description: "ALERT_HANDLER FPV target" filesets: files_formal: depend: - lowrisc:prim:all - - lowrisc:opentitan:top_earlgrey_alert_handler + - lowrisc:earlgrey_ip:alert_handler files: - vip/alert_handler_ping_timer_assert_fpv.sv - tb/alert_handler_ping_timer_bind_fpv.sv diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr.core b/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr.core index 8b23f22e3a56b..d405e922336eb 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr.core +++ b/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_clkmgr:0.1 +name: lowrisc:earlgrey_ip:clkmgr:0.1 description: "Top specific clock manager " filesets: files_rtl: depend: - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg - lowrisc:ip:tlul - lowrisc:prim:all - lowrisc:prim:buf @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:lc_sync - lowrisc:prim:lc_sender - lowrisc:prim:measure - - lowrisc:opentitan:top_earlgrey_clkmgr_pkg:0.1 - - lowrisc:opentitan:top_earlgrey_clkmgr_reg:0.1 + - lowrisc:earlgrey_ip:clkmgr_pkg:0.1 + - lowrisc:earlgrey_ip:clkmgr_reg:0.1 files: - rtl/clkmgr.sv - rtl/clkmgr_byp.sv diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr_pkg.core b/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr_pkg.core index 5a8ea01858c6e..cb17d22c5ed87 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr_pkg.core +++ b/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_clkmgr_pkg:0.1 +name: lowrisc:earlgrey_ip:clkmgr_pkg:0.1 description: "Top specific clock manager package" virtual: - - lowrisc:ip_interfaces:clkmgr_pkg + - lowrisc:virtual_ip:clkmgr_pkg filesets: files_rtl: diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr_reg.core b/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr_reg.core index e269a9e3d8474..3cd979e8e4aa6 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr_reg.core +++ b/hw/top_earlgrey/ip_autogen/clkmgr/clkmgr_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_clkmgr_reg:0.1 +name: lowrisc:earlgrey_ip:clkmgr_reg:0.1 description: "Clock manager registers" filesets: diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/data/top_earlgrey_clkmgr.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/clkmgr/data/top_earlgrey_clkmgr.ipconfig.hjson index 8c5f322131553..300e4cff79701 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/data/top_earlgrey_clkmgr.ipconfig.hjson +++ b/hw/top_earlgrey/ip_autogen/clkmgr/data/top_earlgrey_clkmgr.ipconfig.hjson @@ -262,5 +262,10 @@ pwrmgr_vlnv_prefix: top_earlgrey_ top_pkg_vlnv: lowrisc:constants:top_earlgrey_top_pkg topname: earlgrey + uniquified_modules: + { + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/dv/clkmgr_sim.core b/hw/top_earlgrey/ip_autogen/clkmgr/dv/clkmgr_sim.core index fd0b6201a8e69..52bb2c5af8055 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/dv/clkmgr_sim.core +++ b/hw/top_earlgrey/ip_autogen/clkmgr/dv/clkmgr_sim.core @@ -2,17 +2,17 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_clkmgr_sim:0.1 +name: lowrisc:earlgrey_dv:clkmgr_sim:0.1 description: "CLKMGR DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_clkmgr + - lowrisc:earlgrey_ip:clkmgr files_dv: depend: - - lowrisc:opentitan:top_earlgrey_clkmgr_test:0.1 - - lowrisc:opentitan:top_earlgrey_clkmgr_sva:0.1 + - lowrisc:earlgrey_dv:clkmgr_test:0.1 + - lowrisc:earlgrey_dv:clkmgr_sva:0.1 files: - tb.sv - cov/clkmgr_cov_bind.sv diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson b/hw/top_earlgrey/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson index 12e2fdebdd710..35b18394642e7 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson +++ b/hw/top_earlgrey/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_earlgrey_clkmgr_sim:0.1 + fusesoc_core: lowrisc:earlgrey_dv:clkmgr_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/clkmgr_testplan.hjson" diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/dv/env/clkmgr_env.core b/hw/top_earlgrey/ip_autogen/clkmgr/dv/env/clkmgr_env.core index ae34c0ed91db0..250f55005048c 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/dv/env/clkmgr_env.core +++ b/hw/top_earlgrey/ip_autogen/clkmgr/dv/env/clkmgr_env.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_clkmgr_env:0.1 +name: lowrisc:earlgrey_dv:clkmgr_env:0.1 description: "CLKMGR DV UVM environment" filesets: files_dv: depend: - lowrisc:dv:ralgen - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg - - lowrisc:opentitan:top_earlgrey_clkmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg + - lowrisc:earlgrey_ip:clkmgr_pkg - lowrisc:constants:top_earlgrey_top_pkg files: - clkmgr_csrs_if.sv diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core b/hw/top_earlgrey/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core index 256671d356de9..d365e6aa9d894 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core +++ b/hw/top_earlgrey/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_clkmgr_sva:0.1 +name: lowrisc:earlgrey_dv:clkmgr_sva:0.1 description: "CLKMGR assertion modules and bind file." filesets: files_dv: depend: - lowrisc:tlul:headers - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_earlgrey_clkmgr_sva_ifs:0.1 + - lowrisc:earlgrey_dv:clkmgr_sva_ifs:0.1 files: - clkmgr_bind.sv - clkmgr_sec_cm_checker_assert.sv @@ -17,7 +17,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_earlgrey_clkmgr + - lowrisc:earlgrey_ip:clkmgr generate: csr_assert_gen: diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core b/hw/top_earlgrey/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core index 924b2f63261b1..df767f35cd6f4 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core +++ b/hw/top_earlgrey/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_clkmgr_sva_ifs:0.1 +name: lowrisc:earlgrey_dv:clkmgr_sva_ifs:0.1 description: "CLKMGR SVA interfaces." filesets: files_dv: diff --git a/hw/top_earlgrey/ip_autogen/clkmgr/dv/tests/clkmgr_test.core b/hw/top_earlgrey/ip_autogen/clkmgr/dv/tests/clkmgr_test.core index c5ad79210a529..95f31518e1f1c 100644 --- a/hw/top_earlgrey/ip_autogen/clkmgr/dv/tests/clkmgr_test.core +++ b/hw/top_earlgrey/ip_autogen/clkmgr/dv/tests/clkmgr_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_clkmgr_test:0.1 +name: lowrisc:earlgrey_dv:clkmgr_test:0.1 description: "CLKMGR DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_earlgrey_clkmgr_env:0.1 + - lowrisc:earlgrey_dv:clkmgr_env:0.1 files: - clkmgr_test_pkg.sv - clkmgr_base_test.sv: {is_include_file: true} diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/data/top_earlgrey_flash_ctrl.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/flash_ctrl/data/top_earlgrey_flash_ctrl.ipconfig.hjson index fc85f0f0bee6a..6770641632de0 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/data/top_earlgrey_flash_ctrl.ipconfig.hjson +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/data/top_earlgrey_flash_ctrl.ipconfig.hjson @@ -26,5 +26,10 @@ pwrmgr_vlnv_prefix: top_earlgrey_ top_pkg_vlnv: lowrisc:constants:top_earlgrey_top_pkg topname: earlgrey + uniquified_modules: + { + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/cov/flash_ctrl_cov.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/cov/flash_ctrl_cov.core index e70ed300b564f..0f73c4266b867 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/cov/flash_ctrl_cov.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/cov/flash_ctrl_cov.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl_cov +name: lowrisc:earlgrey_dv:flash_ctrl_cov description: "FLASH_CTRL functional coverage interface & bind." filesets: files_dv: depend: - lowrisc:dv:dv_utils - - lowrisc:opentitan:top_earlgrey_flash_ctrl + - lowrisc:earlgrey_ip:flash_ctrl files: - flash_ctrl_cov_bind.sv - flash_ctrl_phy_cov_if.sv diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core index 699ca39a24d27..17e97d905d489 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl_bkdr_util:0.1 +name: lowrisc:earlgrey_dv:flash_ctrl_bkdr_util:0.1 description: "Backdoor read/write flash memory for DV" filesets: @@ -13,7 +13,7 @@ filesets: - lowrisc:dv:crypto_dpi_prince:0.1 - lowrisc:dv:crypto_dpi_present:0.1 - lowrisc:prim:secded:0.1 - - lowrisc:opentitan:top_earlgrey_flash_ctrl_pkg + - lowrisc:earlgrey_ip:flash_ctrl_pkg - lowrisc:dv:mem_bkdr_util files: - flash_ctrl_bkdr_util_pkg.sv diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_ctrl_env.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_ctrl_env.core index b6b716c7b685c..2b8a34c8bdb7e 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_ctrl_env.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/env/flash_ctrl_env.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl_env:0.1 +name: lowrisc:earlgrey_dv:flash_ctrl_env:0.1 description: "FLASH_CTRL DV UVM environment" filesets: files_dv: @@ -11,10 +11,10 @@ filesets: - lowrisc:dv:dv_base_reg - lowrisc:dv:dv_lib - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_earlgrey_flash_ctrl_bkdr_util + - lowrisc:earlgrey_dv:flash_ctrl_bkdr_util - lowrisc:dv:flash_phy_prim_agent - lowrisc:dv:mem_bkdr_util - - lowrisc:opentitan:top_earlgrey_flash_ctrl_pkg + - lowrisc:earlgrey_ip:flash_ctrl_pkg - lowrisc:constants:top_earlgrey_top_pkg files: - flash_ctrl_eflash_ral_pkg.sv diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson index 28a249ffed02b..fb2b6b4a15129 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson @@ -12,7 +12,7 @@ tb: tb // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_earlgrey_flash_ctrl_sim:0.1 + fusesoc_core: lowrisc:earlgrey_dv:flash_ctrl_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/flash_ctrl_testplan.hjson" diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_sim.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_sim.core index 9a55582a95603..24f8f7ab2901c 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_sim.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_sim.core @@ -2,22 +2,22 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl_sim:0.1 +name: lowrisc:earlgrey_dv:flash_ctrl_sim:0.1 description: "FLASH_CTRL DV sim target" filesets: files_rtl: depend: - lowrisc:ip:tlul - lowrisc:constants:top_earlgrey_top_pkg - - lowrisc:opentitan:top_earlgrey_flash_ctrl:0.1 + - lowrisc:earlgrey_ip:flash_ctrl:0.1 file_type: systemVerilogSource files_dv: depend: - - lowrisc:opentitan:top_earlgrey_flash_ctrl_bkdr_util - - lowrisc:opentitan:top_earlgrey_flash_ctrl_test - - lowrisc:opentitan:top_earlgrey_flash_ctrl_sva - - lowrisc:opentitan:top_earlgrey_flash_ctrl_cov + - lowrisc:earlgrey_dv:flash_ctrl_bkdr_util + - lowrisc:earlgrey_dv:flash_ctrl_test + - lowrisc:earlgrey_dv:flash_ctrl_sva + - lowrisc:earlgrey_dv:flash_ctrl_cov files: - tb/tb.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/sva/flash_ctrl_sva.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/sva/flash_ctrl_sva.core index 0e17fda3a691e..43d0969c763e3 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/sva/flash_ctrl_sva.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/sva/flash_ctrl_sva.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl_sva:0.1 +name: lowrisc:earlgrey_dv:flash_ctrl_sva:0.1 description: "FLASH_CTRL assertion modules and bind file." filesets: files_dv: depend: - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_earlgrey_flash_ctrl_pkg + - lowrisc:earlgrey_ip:flash_ctrl_pkg - lowrisc:tlul:headers - lowrisc:fpv:csr_assert_gen files: @@ -17,7 +17,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_earlgrey_flash_ctrl + - lowrisc:earlgrey_ip:flash_ctrl generate: csr_assert_gen: diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/tests/flash_ctrl_test.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/tests/flash_ctrl_test.core index 0a3703d1c7dfd..affa70c6a578c 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/tests/flash_ctrl_test.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/tests/flash_ctrl_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl_test:0.1 +name: lowrisc:earlgrey_dv:flash_ctrl_test:0.1 description: "FLASH_CTRL DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_earlgrey_flash_ctrl_env + - lowrisc:earlgrey_dv:flash_ctrl_env files: - flash_ctrl_test_pkg.sv - flash_ctrl_base_test.sv: {is_include_file: true} diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl.core index 56fa5c8ea3f38..c7a4fd5343bee 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl:0.1 +name: lowrisc:earlgrey_ip:flash_ctrl:0.1 description: "Flash Controller" filesets: @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:secded - lowrisc:prim:sparse_fsm - lowrisc:ip:otp_ctrl_pkg - - lowrisc:opentitan:top_earlgrey_flash_ctrl_pkg - - lowrisc:opentitan:top_earlgrey_flash_ctrl_reg + - lowrisc:earlgrey_ip:flash_ctrl_pkg + - lowrisc:earlgrey_ip:flash_ctrl_reg - lowrisc:constants:top_earlgrey_top_pkg - lowrisc:ip:jtag_pkg files: diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_pkg.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_pkg.core index 79fe2cee354d7..405fcb00fe3c7 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_pkg.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl_pkg:0.1 +name: lowrisc:earlgrey_ip:flash_ctrl_pkg:0.1 description: "Top specific flash package" virtual: - - lowrisc:ip_interfaces:flash_ctrl_pkg + - lowrisc:virtual_ip:flash_ctrl_pkg filesets: files_rtl: @@ -13,7 +13,7 @@ filesets: - lowrisc:constants:top_earlgrey_top_pkg - lowrisc:prim:util - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg - lowrisc:ip:jtag_pkg - lowrisc:ip:edn_pkg - lowrisc:tlul:headers diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_prim_reg_top.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_prim_reg_top.core index 1bd6448e75f91..8ad48a417a878 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_prim_reg_top.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_prim_reg_top.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl_prim_reg_top:1.0 +name: lowrisc:earlgrey_ip:flash_ctrl_prim_reg_top:1.0 description: "Generic register top for the FLASH wrapper" virtual: - - lowrisc:ip_interfaces:flash_ctrl_prim_reg_top + - lowrisc:virtual_ip:flash_ctrl_prim_reg_top filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_flash_ctrl_pkg + - lowrisc:earlgrey_ip:flash_ctrl_pkg files: - rtl/flash_ctrl_prim_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_reg.core b/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_reg.core index cdeaee618b803..a65a70ec3f0ea 100644 --- a/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_reg.core +++ b/hw/top_earlgrey/ip_autogen/flash_ctrl/flash_ctrl_reg.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_flash_ctrl_reg:0.1 +name: lowrisc:earlgrey_ip:flash_ctrl_reg:0.1 description: "Flash registers" filesets: files_rtl: depend: - lowrisc:ip:tlul - - lowrisc:opentitan:top_earlgrey_flash_ctrl_pkg + - lowrisc:earlgrey_ip:flash_ctrl_pkg files: - rtl/flash_ctrl_core_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/data/top_earlgrey_otp_ctrl.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/otp_ctrl/data/top_earlgrey_otp_ctrl.ipconfig.hjson index fac0eb85b6868..27e88e0f50aa3 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/data/top_earlgrey_otp_ctrl.ipconfig.hjson +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/data/top_earlgrey_otp_ctrl.ipconfig.hjson @@ -1986,5 +1986,10 @@ ] } topname: earlgrey + uniquified_modules: + { + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/cov/otp_ctrl_cov.core b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/cov/otp_ctrl_cov.core index d79dccd6302c1..17f7a74c4fc5f 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/cov/otp_ctrl_cov.core +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/cov/otp_ctrl_cov.core @@ -2,16 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_otp_ctrl_cov +name: lowrisc:earlgrey_dv:otp_ctrl_cov description: "OTP_CTRL functional coverage and bind files" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_cov filesets: files_rtl: depend: - - lowrisc:ip_interfaces:pwrmgr_pkg - - lowrisc:opentitan:top_earlgrey_otp_ctrl_top_specific_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg + - lowrisc:earlgrey_ip:otp_ctrl_top_specific_pkg files_dv: depend: diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/env/otp_ctrl_env.core b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/env/otp_ctrl_env.core index 6d47a38008213..aa69b5344fc30 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/env/otp_ctrl_env.core +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/env/otp_ctrl_env.core @@ -2,10 +2,8 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_otp_ctrl_env:0.1 +name: lowrisc:earlgrey_dv:otp_ctrl_env:0.1 description: "OTP_CTRL DV UVM environment" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_env filesets: files_dv: diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core index 9ece5ffaf87b1..64c4760a95819 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/env/otp_ctrl_mem_bkdr_util.core @@ -2,10 +2,8 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_otp_ctrl_mem_bkdr_util:0.1 +name: lowrisc:earlgrey_dv:otp_ctrl_mem_bkdr_util:0.1 description: "OTP_CTRL mem_bkdr_util support package" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_mem_bkdr_util filesets: files_dv: @@ -13,7 +11,7 @@ filesets: - lowrisc:dv:mem_bkdr_util - lowrisc:dv:crypto_dpi_present - lowrisc:dv:lc_ctrl_dv_utils - - lowrisc:opentitan:top_earlgrey_otp_ctrl_top_specific_pkg:1.0 + - lowrisc:earlgrey_ip:otp_ctrl_top_specific_pkg:1.0 files: - otp_scrambler_pkg.sv - otp_ctrl_mem_bkdr_util_pkg.sv diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/otp_ctrl_sim.core b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/otp_ctrl_sim.core index b13157c676123..501ebba1df032 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/otp_ctrl_sim.core +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/otp_ctrl_sim.core @@ -2,22 +2,20 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_otp_ctrl_sim:0.1 +name: lowrisc:earlgrey_dv:otp_ctrl_sim:0.1 description: "OTP_CTRL DV sim target" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_sim filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_otp_ctrl + - lowrisc:earlgrey_ip:otp_ctrl files_dv: depend: - lowrisc:dv:mem_bkdr_util - - lowrisc:opentitan:top_earlgrey_otp_ctrl_test - - lowrisc:opentitan:top_earlgrey_otp_ctrl_sva - - lowrisc:opentitan:top_earlgrey_otp_ctrl_cov + - lowrisc:earlgrey_dv:otp_ctrl_test + - lowrisc:earlgrey_dv:otp_ctrl_sva + - lowrisc:earlgrey_dv:otp_ctrl_cov files: - tb.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/otp_ctrl_sim_cfg.hjson b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/otp_ctrl_sim_cfg.hjson index 85730a34bee50..1760a81b1ab59 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/otp_ctrl_sim_cfg.hjson +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/otp_ctrl_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_earlgrey_otp_ctrl_sim:0.1 + fusesoc_core: lowrisc:earlgrey_dv:otp_ctrl_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/otp_ctrl_testplan.hjson" diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/sva/otp_ctrl_sva.core b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/sva/otp_ctrl_sva.core index abffc8422e998..c1ef2d1599d83 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/sva/otp_ctrl_sva.core +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/sva/otp_ctrl_sva.core @@ -2,10 +2,8 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_otp_ctrl_sva:0.1 +name: lowrisc:earlgrey_dv:otp_ctrl_sva:0.1 description: "OTP_CTRL assertion modules and bind file." -virtual: - - lowrisc:ip_interfaces:otp_ctrl_sva filesets: files_dv: @@ -18,7 +16,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_earlgrey_otp_ctrl + - lowrisc:earlgrey_ip:otp_ctrl generate: csr_assert_gen: diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/tests/otp_ctrl_test.core b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/tests/otp_ctrl_test.core index 352faec4f87a6..61c79a735fa3e 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/tests/otp_ctrl_test.core +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/dv/tests/otp_ctrl_test.core @@ -2,15 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_otp_ctrl_test:0.1 +name: lowrisc:earlgrey_dv:otp_ctrl_test:0.1 description: "OTP_CTRL DV UVM test" -virtual: - - lowrisc:ip_interfaces:otp_ctrl_test filesets: files_dv: depend: - - lowrisc:opentitan:top_earlgrey_otp_ctrl_env + - lowrisc:earlgrey_dv:otp_ctrl_env files: - otp_ctrl_test_pkg.sv - otp_ctrl_base_test.sv: {is_include_file: true} diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl.core b/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl.core index a7951dd4ccccb..34704f6162b8c 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl.core +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl.core @@ -2,16 +2,16 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_otp_ctrl:1.0 +name: lowrisc:earlgrey_ip:otp_ctrl:1.0 description: "OTP Controller" virtual: - - lowrisc:ip_interfaces:otp_ctrl + - lowrisc:virtual_ip:otp_ctrl filesets: files_rtl: depend: - lowrisc:ip:otp_ctrl_pkg - - lowrisc:opentitan:top_earlgrey_otp_ctrl_top_specific_pkg + - lowrisc:earlgrey_ip:otp_ctrl_top_specific_pkg - lowrisc:ip:tlul - lowrisc:prim:all - lowrisc:prim:ram_1p @@ -25,7 +25,7 @@ filesets: - lowrisc:prim:secded - lowrisc:prim:edn_req - lowrisc:prim:sec_anchor - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg - lowrisc:ip:edn_pkg - lowrisc:prim:sparse_fsm - "fileset_partner ? (partner:systems:ast_pkg)" diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl_prim_reg_top.core b/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl_prim_reg_top.core index 817b3e74434c6..0ee457b560ea6 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl_prim_reg_top.core +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl_prim_reg_top.core @@ -10,7 +10,7 @@ filesets: # otp_ctrl_prim_reg_top.sv should depend on generic items for now. # This may change and will require reworking the flow to generate # the otp prim. - - lowrisc:ip_interfaces:otp_ctrl_top_specific_pkg + - lowrisc:virtual_ip:otp_ctrl_top_specific_pkg files: - rtl/otp_ctrl_prim_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl_top_specific_pkg.core b/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl_top_specific_pkg.core index f212eaab353e7..6a7b3598713ec 100644 --- a/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl_top_specific_pkg.core +++ b/hw/top_earlgrey/ip_autogen/otp_ctrl/otp_ctrl_top_specific_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_otp_ctrl_top_specific_pkg:1.0 +name: lowrisc:earlgrey_ip:otp_ctrl_top_specific_pkg:1.0 description: "OTP Controller Top Specific Packages" virtual: - - lowrisc:ip_interfaces:otp_ctrl_top_specific_pkg + - lowrisc:virtual_ip:otp_ctrl_top_specific_pkg filesets: files_rtl: diff --git a/hw/top_earlgrey/ip_autogen/pinmux/data/top_earlgrey_pinmux.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/pinmux/data/top_earlgrey_pinmux.ipconfig.hjson index b2677c6502a88..0ac987fa52633 100644 --- a/hw/top_earlgrey/ip_autogen/pinmux/data/top_earlgrey_pinmux.ipconfig.hjson +++ b/hw/top_earlgrey/ip_autogen/pinmux/data/top_earlgrey_pinmux.ipconfig.hjson @@ -18,5 +18,10 @@ top_pkg_vlnv: lowrisc:constants:top_earlgrey_top_pkg scan_role_pkg_vlnv: lowrisc:systems:top_earlgrey_scan_role_pkg topname: earlgrey + uniquified_modules: + { + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core b/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core index 36fd56933ce4e..ae1d984781bb5 100644 --- a/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core +++ b/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pinmux_chip_fpv:0.1 +name: lowrisc:earlgrey_systems:pinmux_chip_fpv:0.1 description: "pinmux FPV target with chip_earlgrey parameters" filesets: @@ -13,9 +13,9 @@ filesets: - lowrisc:ip:jtag_pkg - lowrisc:prim:mubi_pkg - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_earlgrey_pinmux:0.1 + - lowrisc:earlgrey_ip:pinmux:0.1 - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_earlgrey_pinmux_common_fpv:0.1 + - lowrisc:earlgrey_fpv:pinmux_common_fpv:0.1 - lowrisc:constants:top_earlgrey_top_pkg - lowrisc:systems:top_earlgrey_scan_role_pkg files: diff --git a/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_common_fpv.core b/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_common_fpv.core index 959c132dda6ed..6c46f76d3d728 100644 --- a/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_common_fpv.core +++ b/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_common_fpv.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pinmux_common_fpv:0.1 +name: lowrisc:earlgrey_fpv:pinmux_common_fpv:0.1 description: "pinmux common FPV target" filesets: files_formal: depend: - lowrisc:prim:all - lowrisc:ip:tlul - - lowrisc:opentitan:top_earlgrey_pinmux:0.1 + - lowrisc:earlgrey_ip:pinmux:0.1 files: - vip/pinmux_assert_fpv.sv - tb/pinmux_bind_fpv.sv diff --git a/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_fpv.core b/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_fpv.core index 6810cdb60eb9b..0cc6c1c0b0ee5 100644 --- a/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_fpv.core +++ b/hw/top_earlgrey/ip_autogen/pinmux/fpv/pinmux_fpv.core @@ -2,16 +2,16 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pinmux_fpv:0.1 +name: lowrisc:earlgrey_fpv:pinmux_fpv:0.1 description: "pinmux FPV target" filesets: files_formal: depend: - lowrisc:prim:all - lowrisc:ip:tlul - - lowrisc:opentitan:top_earlgrey_pinmux:0.1 + - lowrisc:earlgrey_ip:pinmux:0.1 - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_earlgrey_pinmux_common_fpv + - lowrisc:earlgrey_fpv:pinmux_common_fpv files: - tb/pinmux_tb.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/pinmux/pinmux.core b/hw/top_earlgrey/ip_autogen/pinmux/pinmux.core index 9d0227cdbb1b5..ea44d29a9c482 100644 --- a/hw/top_earlgrey/ip_autogen/pinmux/pinmux.core +++ b/hw/top_earlgrey/ip_autogen/pinmux/pinmux.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pinmux:0.1 +name: lowrisc:earlgrey_ip:pinmux:0.1 description: "Pin Multiplexer" filesets: @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:pad_attr - lowrisc:ip:jtag_pkg - lowrisc:ip:usbdev - - lowrisc:opentitan:top_earlgrey_pinmux_reg:0.1 - - lowrisc:opentitan:top_earlgrey_pinmux_pkg:0.1 + - lowrisc:earlgrey_ip:pinmux_reg:0.1 + - lowrisc:earlgrey_ip:pinmux_pkg:0.1 files: - rtl/pinmux_wkup.sv - rtl/pinmux_jtag_buf.sv diff --git a/hw/top_earlgrey/ip_autogen/pinmux/pinmux_pkg.core b/hw/top_earlgrey/ip_autogen/pinmux/pinmux_pkg.core index 099a5382c8c9d..c7788e031c734 100644 --- a/hw/top_earlgrey/ip_autogen/pinmux/pinmux_pkg.core +++ b/hw/top_earlgrey/ip_autogen/pinmux/pinmux_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pinmux_pkg:0.1 +name: lowrisc:earlgrey_ip:pinmux_pkg:0.1 description: "Pinmux package" virtual: - - lowrisc:ip_interfaces:pinmux_pkg + - lowrisc:virtual_ip:pinmux_pkg filesets: files_rtl: diff --git a/hw/top_earlgrey/ip_autogen/pinmux/pinmux_reg.core b/hw/top_earlgrey/ip_autogen/pinmux/pinmux_reg.core index 585d4c3c04d04..c1d79f65b427e 100644 --- a/hw/top_earlgrey/ip_autogen/pinmux/pinmux_reg.core +++ b/hw/top_earlgrey/ip_autogen/pinmux/pinmux_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pinmux_reg:0.1 +name: lowrisc:earlgrey_ip:pinmux_reg:0.1 description: "Auto-generated pinmux register sources" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:ip:tlul - lowrisc:prim:subreg - - lowrisc:opentitan:top_earlgrey_pinmux_pkg + - lowrisc:earlgrey_ip:pinmux_pkg files: - rtl/pinmux_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson b/hw/top_earlgrey/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson index bfe2b047b27c7..256d4b7d85e72 100644 --- a/hw/top_earlgrey/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson +++ b/hw/top_earlgrey/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson @@ -6,7 +6,7 @@ name: pinmux // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_earlgrey_pinmux:0.1 + fusesoc_core: lowrisc:earlgrey_ip:pinmux:0.1 import_cfgs: [// Project wide common synthesis config file "{proj_root}/hw/syn/tools/dvsim/common_syn_cfg.hjson"], diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/data/top_earlgrey_pwrmgr.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/pwrmgr/data/top_earlgrey_pwrmgr.ipconfig.hjson index 9a06d93fc3131..a6ce20575e758 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/data/top_earlgrey_pwrmgr.ipconfig.hjson +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/data/top_earlgrey_pwrmgr.ipconfig.hjson @@ -83,5 +83,10 @@ NumRomInputs: 1 top_pkg_vlnv: lowrisc:constants:top_earlgrey_top_pkg topname: earlgrey + uniquified_modules: + { + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core index 88c75af585249..f798a83ef7115 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pwrmgr_env:0.1 +name: lowrisc:earlgrey_dv:pwrmgr_env:0.1 description: "PWRMGR DV UVM environment" filesets: files_dv: @@ -10,7 +10,7 @@ filesets: - lowrisc:dv:ralgen - lowrisc:dv:cip_lib - lowrisc:ip:rv_core_ibex_pkg - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg - lowrisc:constants:top_earlgrey_top_pkg files: - pwrmgr_env_pkg.sv diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/pwrmgr_sim.core b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/pwrmgr_sim.core index 5ff0cdf257430..f91d66fb7286b 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/pwrmgr_sim.core +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/pwrmgr_sim.core @@ -2,17 +2,17 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pwrmgr_sim:0.1 +name: lowrisc:earlgrey_dv:pwrmgr_sim:0.1 description: "PWRMGR DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_pwrmgr:0.1 + - lowrisc:earlgrey_ip:pwrmgr:0.1 files_dv: depend: - - lowrisc:opentitan:top_earlgrey_pwrmgr_test:0.1 - - lowrisc:opentitan:top_earlgrey_pwrmgr_sva:0.1 - - lowrisc:opentitan:top_earlgrey_pwrmgr_unit_only_sva:0.1 + - lowrisc:earlgrey_dv:pwrmgr_test:0.1 + - lowrisc:earlgrey_dv:pwrmgr_sva:0.1 + - lowrisc:earlgrey_dv:pwrmgr_unit_only_sva:0.1 files: - tb.sv - cov/pwrmgr_cov_bind.sv diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson index 55f1a107ccaef..8c88aabc00b7b 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_earlgrey_pwrmgr_sim:0.1 + fusesoc_core: lowrisc:earlgrey_dv:pwrmgr_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/pwrmgr_testplan.hjson" diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core index 84714d4887019..c34578ec8cce1 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pwrmgr_sva:0.1 +name: lowrisc:earlgrey_dv:pwrmgr_sva:0.1 description: "PWRMGR assertion modules and bind file." filesets: files_dv: @@ -11,7 +11,7 @@ filesets: - lowrisc:fpv:csr_assert_gen - lowrisc:dv:clkmgr_pwrmgr_sva_if - lowrisc:dv:pwrmgr_rstmgr_sva_if:0.1 - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg files: - pwrmgr_bind.sv - pwrmgr_clock_enables_sva_if.sv @@ -21,7 +21,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_earlgrey_pwrmgr:0.1 + - lowrisc:earlgrey_ip:pwrmgr:0.1 generate: csr_assert_gen: diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core index faa38ca46aa83..19ccc4f7dd5dd 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pwrmgr_unit_only_sva:0.1 +name: lowrisc:earlgrey_dv:pwrmgr_unit_only_sva:0.1 description: "PWRMGR assertion interfaces not suitable for chip level bind file." filesets: files_dv: @@ -10,8 +10,8 @@ filesets: - lowrisc:tlul:headers - lowrisc:fpv:csr_assert_gen - lowrisc:dv:pwrmgr_rstmgr_sva_if - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg:0.1 - - lowrisc:opentitan:top_earlgrey_pwrmgr:0.1 + - lowrisc:earlgrey_ip:pwrmgr_pkg:0.1 + - lowrisc:earlgrey_ip:pwrmgr:0.1 files: - pwrmgr_unit_only_bind.sv diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core index dc3c3628709f8..3d013333bafa8 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pwrmgr_test:0.1 +name: lowrisc:earlgrey_dv:pwrmgr_test:0.1 description: "PWRMGR DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_earlgrey_pwrmgr_env:0.1 + - lowrisc:earlgrey_dv:pwrmgr_env:0.1 files: - pwrmgr_test_pkg.sv - pwrmgr_base_test.sv: {is_include_file: true} diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr.core b/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr.core index 41fbcd730503f..9a186f15261f0 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr.core +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pwrmgr:0.1 +name: lowrisc:earlgrey_ip:pwrmgr:0.1 description: "Power manager RTL" filesets: @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:mubi - lowrisc:prim:clock_buf - lowrisc:prim:measure - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg:0.1 - - lowrisc:opentitan:top_earlgrey_pwrmgr_reg:0.1 + - lowrisc:earlgrey_ip:pwrmgr_pkg:0.1 + - lowrisc:earlgrey_ip:pwrmgr_reg:0.1 files: - rtl/pwrmgr_cdc.sv - rtl/pwrmgr_slow_fsm.sv diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr_pkg.core b/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr_pkg.core index 9332e68a2b18e..5f7d8f351b943 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr_pkg.core +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pwrmgr_pkg:0.1 +name: lowrisc:earlgrey_ip:pwrmgr_pkg:0.1 description: "Power manager package" virtual: - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:virtual_ip:pwrmgr_pkg filesets: files_rtl: diff --git a/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr_reg.core b/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr_reg.core index 4e738f8e5e7d0..e24abfcf9aff9 100644 --- a/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr_reg.core +++ b/hw/top_earlgrey/ip_autogen/pwrmgr/pwrmgr_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_pwrmgr_reg:0.1 +name: lowrisc:earlgrey_ip:pwrmgr_reg:0.1 description: "Power manager registers" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:ip:tlul - lowrisc:prim:subreg - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg files: - rtl/pwrmgr_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/data/top_earlgrey_rstmgr.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/rstmgr/data/top_earlgrey_rstmgr.ipconfig.hjson index 386a034a31763..ced8d28feb5f7 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/data/top_earlgrey_rstmgr.ipconfig.hjson +++ b/hw/top_earlgrey/ip_autogen/rstmgr/data/top_earlgrey_rstmgr.ipconfig.hjson @@ -695,5 +695,10 @@ pwrmgr_vlnv_prefix: top_earlgrey_ top_pkg_vlnv: lowrisc:constants:top_earlgrey_top_pkg topname: earlgrey + uniquified_modules: + { + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/dv/env/rstmgr_env.core b/hw/top_earlgrey/ip_autogen/rstmgr/dv/env/rstmgr_env.core index 4db3aadcc7c12..d75024e698eed 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/dv/env/rstmgr_env.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/dv/env/rstmgr_env.core @@ -2,18 +2,18 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr_env:0.1 +name: lowrisc:earlgrey_dv:rstmgr_env:0.1 description: "RSTMGR DV UVM environment" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_rstmgr + - lowrisc:earlgrey_ip:rstmgr files_dv: depend: - lowrisc:dv:ralgen - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_earlgrey_rstmgr_pkg + - lowrisc:earlgrey_ip:rstmgr_pkg - lowrisc:constants:top_earlgrey_top_pkg files: diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core b/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core index 827446a73f4c4..c3747adab179b 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr_cnsty_chk_sim:0.1 +name: lowrisc:earlgrey_dv:rstmgr_cnsty_chk_sim:0.1 description: "Rstmgr_cnsty_chk DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_rstmgr_cnsty_chk:0.1 + - lowrisc:earlgrey_ip:rstmgr_cnsty_chk:0.1 - lowrisc:dv:sec_cm file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson b/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson index 690ad6c4809f1..36417d3c97f0d 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson +++ b/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_earlgrey_rstmgr_cnsty_chk_sim:0.1 + fusesoc_core: lowrisc:earlgrey_dv:rstmgr_cnsty_chk_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/data/rstmgr_cnsty_chk_testplan.hjson" diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_sim.core b/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_sim.core index 71c93d278eb87..88c9724a0987a 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_sim.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_sim.core @@ -2,17 +2,17 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr_sim:0.1 +name: lowrisc:earlgrey_dv:rstmgr_sim:0.1 description: "RSTMGR DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_rstmgr + - lowrisc:earlgrey_ip:rstmgr files_dv: depend: - - lowrisc:opentitan:top_earlgrey_rstmgr_test:0.1 - - lowrisc:opentitan:top_earlgrey_rstmgr_sva:0.1 + - lowrisc:earlgrey_dv:rstmgr_test:0.1 + - lowrisc:earlgrey_dv:rstmgr_sva:0.1 files: - tb.sv - cov/rstmgr_cov_bind.sv diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson b/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson index a9c4185dcebf7..ceb9d8870a3c6 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson +++ b/hw/top_earlgrey/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_earlgrey_rstmgr_sim:0.1 + fusesoc_core: lowrisc:earlgrey_dv:rstmgr_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/rstmgr_testplan.hjson" diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core b/hw/top_earlgrey/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core index c85250d557221..03e7593ba2c55 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr_sva:0.1 +name: lowrisc:earlgrey_dv:rstmgr_sva:0.1 description: "RSTMGR assertion modules and bind file." filesets: files_dv: depend: - lowrisc:prim:mubi - - lowrisc:opentitan:top_earlgrey_rstmgr_pkg:0.1 + - lowrisc:earlgrey_ip:rstmgr_pkg:0.1 - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_earlgrey_rstmgr_sva_ifs:0.1 + - lowrisc:earlgrey_dv:rstmgr_sva_ifs:0.1 files: - rstmgr_bind.sv diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core b/hw/top_earlgrey/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core index 09deedc207685..0f2cba2214234 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr_sva_ifs:0.1 +name: lowrisc:earlgrey_dv:rstmgr_sva_ifs:0.1 description: "RSTMGR cascading resets assertion interface." filesets: files_dv: depend: - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg - lowrisc:dv:pwrmgr_rstmgr_sva_if - - lowrisc:opentitan:top_earlgrey_rstmgr + - lowrisc:earlgrey_ip:rstmgr files: - rstmgr_attrs_sva_if.sv diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/dv/tests/rstmgr_test.core b/hw/top_earlgrey/ip_autogen/rstmgr/dv/tests/rstmgr_test.core index f3e7bf0fbe554..a80f330499eac 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/dv/tests/rstmgr_test.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/dv/tests/rstmgr_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr_test:0.1 +name: lowrisc:earlgrey_dv:rstmgr_test:0.1 description: "RSTMGR DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_earlgrey_rstmgr_env:0.1 + - lowrisc:earlgrey_dv:rstmgr_env:0.1 files: - rstmgr_test_pkg.sv - rstmgr_base_test.sv: {is_include_file: true} diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr.core b/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr.core index e356a1d7425c6..d33bdf1b57e46 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr:0.1 +name: lowrisc:earlgrey_ip:rstmgr:0.1 description: "Reset manager RTL" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_alert_handler_pkg + - lowrisc:earlgrey_ip:alert_handler_pkg - lowrisc:ip:rv_core_ibex_pkg - lowrisc:ip:tlul - lowrisc:prim:clock_mux2 @@ -17,9 +17,9 @@ filesets: - lowrisc:prim:mubi - lowrisc:prim:clock_buf - lowrisc:prim:sparse_fsm - - lowrisc:opentitan:top_earlgrey_rstmgr_pkg:0.1 - - lowrisc:opentitan:top_earlgrey_rstmgr_reg:0.1 - - lowrisc:opentitan:top_earlgrey_rstmgr_cnsty_chk:0.1 + - lowrisc:earlgrey_ip:rstmgr_pkg:0.1 + - lowrisc:earlgrey_ip:rstmgr_reg:0.1 + - lowrisc:earlgrey_ip:rstmgr_cnsty_chk:0.1 files: - rtl/rstmgr_ctrl.sv - rtl/rstmgr_por.sv diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_cnsty_chk.core b/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_cnsty_chk.core index ccb48ceed8661..506053b58e5ae 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_cnsty_chk.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_cnsty_chk.core @@ -3,7 +3,7 @@ CAPI=2: # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr_cnsty_chk:0.1 +name: lowrisc:earlgrey_ip:rstmgr_cnsty_chk:0.1 description: "Rstmgr consistency checker" filesets: files_rtl: @@ -11,7 +11,7 @@ filesets: - lowrisc:prim:all - lowrisc:prim:sparse_fsm - lowrisc:ip:rv_core_ibex_pkg - - lowrisc:opentitan:top_earlgrey_rstmgr_pkg + - lowrisc:earlgrey_ip:rstmgr_pkg files: - rtl/rstmgr_cnsty_chk.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_pkg.core b/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_pkg.core index 0b5d60d638663..3638a792061d3 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_pkg.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_pkg.core @@ -2,15 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr_pkg:0.1 +name: lowrisc:earlgrey_ip:rstmgr_pkg:0.1 description: "Reset manager package" -virtual: - - lowrisc:ip_interfaces:rstmgr_pkg filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg + - lowrisc:earlgrey_ip:pwrmgr_pkg files: - rtl/rstmgr_reg_pkg.sv - rtl/rstmgr_pkg.sv diff --git a/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_reg.core b/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_reg.core index 1acada06a8e2d..10c984daee597 100644 --- a/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_reg.core +++ b/hw/top_earlgrey/ip_autogen/rstmgr/rstmgr_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rstmgr_reg:0.1 +name: lowrisc:earlgrey_ip:rstmgr_reg:0.1 description: "Reset manager registers" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:tlul:headers - lowrisc:prim:subreg - - lowrisc:opentitan:top_earlgrey_rstmgr_pkg + - lowrisc:earlgrey_ip:rstmgr_pkg files: - rtl/rstmgr_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_earlgrey/ip_autogen/rv_plic/data/top_earlgrey_rv_plic.ipconfig.hjson b/hw/top_earlgrey/ip_autogen/rv_plic/data/top_earlgrey_rv_plic.ipconfig.hjson index 08ce5967d4050..6146fd2f0bae7 100644 --- a/hw/top_earlgrey/ip_autogen/rv_plic/data/top_earlgrey_rv_plic.ipconfig.hjson +++ b/hw/top_earlgrey/ip_autogen/rv_plic/data/top_earlgrey_rv_plic.ipconfig.hjson @@ -10,5 +10,10 @@ target: 1 prio: 3 topname: earlgrey + uniquified_modules: + { + alert_handler: alert_handler + rv_plic: rv_plic + } } } diff --git a/hw/top_earlgrey/ip_autogen/rv_plic/fpv/rv_plic_fpv.core b/hw/top_earlgrey/ip_autogen/rv_plic/fpv/rv_plic_fpv.core index d8f9ce3a117d8..6c2aa356ee24a 100644 --- a/hw/top_earlgrey/ip_autogen/rv_plic/fpv/rv_plic_fpv.core +++ b/hw/top_earlgrey/ip_autogen/rv_plic/fpv/rv_plic_fpv.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rv_plic_fpv:0.1 +name: lowrisc:earlgrey_ip:rv_plic_fpv:0.1 description: "FPV for RISC-V PLIC" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:ip:tlul - lowrisc:prim:all - - lowrisc:opentitan:top_earlgrey_rv_plic + - lowrisc:earlgrey_ip:rv_plic - lowrisc:fpv:csr_assert_gen files: - tb/rv_plic_bind_fpv.sv @@ -24,7 +24,7 @@ generate: generator: csr_assert_gen parameters: spec: ../data/rv_plic.hjson - depend: lowrisc:opentitan:top_earlgrey_rv_plic + depend: lowrisc:earlgrey_ip:rv_plic targets: default: &default_target diff --git a/hw/top_earlgrey/ip_autogen/rv_plic/rv_plic.core b/hw/top_earlgrey/ip_autogen/rv_plic/rv_plic.core index 057786c8226ef..7917f72a599e0 100644 --- a/hw/top_earlgrey/ip_autogen/rv_plic/rv_plic.core +++ b/hw/top_earlgrey/ip_autogen/rv_plic/rv_plic.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rv_plic:0.1 +name: lowrisc:earlgrey_ip:rv_plic:0.1 description: "RISC-V Platform Interrupt Controller (PLIC)" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_rv_plic_component:0.1 + - lowrisc:earlgrey_ip:rv_plic_component:0.1 - lowrisc:ip:tlul - lowrisc:prim:subreg files: diff --git a/hw/top_earlgrey/ip_autogen/rv_plic/rv_plic_component.core b/hw/top_earlgrey/ip_autogen/rv_plic/rv_plic_component.core index 8287213170342..46b3f05f4c28b 100644 --- a/hw/top_earlgrey/ip_autogen/rv_plic/rv_plic_component.core +++ b/hw/top_earlgrey/ip_autogen/rv_plic/rv_plic_component.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_earlgrey_rv_plic_component:0.1 +name: lowrisc:earlgrey_ip:rv_plic_component:0.1 description: "RISC-V Platform Interrupt Controller (PLIC)" filesets: diff --git a/hw/top_earlgrey/top_earlgrey.core b/hw/top_earlgrey/top_earlgrey.core index 3d4df3b6a481b..bd35d31c8950b 100644 --- a/hw/top_earlgrey/top_earlgrey.core +++ b/hw/top_earlgrey/top_earlgrey.core @@ -9,8 +9,8 @@ filesets: depend: # Place the autogen packages first to avoid conflicts - lowrisc:systems:top_earlgrey_racl_pkg - - lowrisc:opentitan:top_earlgrey_alert_handler_reg - - lowrisc:opentitan:top_earlgrey_pwrmgr_pkg + - lowrisc:earlgrey_ip:alert_handler_reg + - lowrisc:earlgrey_ip:pwrmgr_pkg - lowrisc:ip:uart:0.1 - lowrisc:ip:gpio - lowrisc:ip:rv_core_ibex @@ -40,14 +40,14 @@ filesets: - lowrisc:ip:usbdev - lowrisc:top_earlgrey:xbar_main - lowrisc:top_earlgrey:xbar_peri - - lowrisc:opentitan:top_earlgrey_alert_handler - - lowrisc:opentitan:top_earlgrey_clkmgr - - lowrisc:opentitan:top_earlgrey_flash_ctrl - - lowrisc:opentitan:top_earlgrey_otp_ctrl - - lowrisc:opentitan:top_earlgrey_pinmux - - lowrisc:opentitan:top_earlgrey_pwrmgr - - lowrisc:opentitan:top_earlgrey_rstmgr - - lowrisc:opentitan:top_earlgrey_rv_plic + - lowrisc:earlgrey_ip:alert_handler + - lowrisc:earlgrey_ip:clkmgr + - lowrisc:earlgrey_ip:flash_ctrl + - lowrisc:earlgrey_ip:otp_ctrl + - lowrisc:earlgrey_ip:pinmux + - lowrisc:earlgrey_ip:pwrmgr + - lowrisc:earlgrey_ip:rstmgr + - lowrisc:earlgrey_ip:rv_plic - lowrisc:ip:aon_timer - lowrisc:ip:adc_ctrl - lowrisc:ip:sysrst_ctrl diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr.core b/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr.core index 21db3b5bcf8c3..748ec64fe3bc7 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr.core +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_clkmgr:0.1 +name: lowrisc:englishbreakfast_ip:clkmgr:0.1 description: "Top specific clock manager " filesets: files_rtl: depend: - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg + - lowrisc:englishbreakfast_ip:pwrmgr_pkg - lowrisc:ip:tlul - lowrisc:prim:all - lowrisc:prim:buf @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:lc_sync - lowrisc:prim:lc_sender - lowrisc:prim:measure - - lowrisc:opentitan:top_englishbreakfast_clkmgr_pkg:0.1 - - lowrisc:opentitan:top_englishbreakfast_clkmgr_reg:0.1 + - lowrisc:englishbreakfast_ip:clkmgr_pkg:0.1 + - lowrisc:englishbreakfast_ip:clkmgr_reg:0.1 files: - rtl/clkmgr.sv - rtl/clkmgr_byp.sv diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr_pkg.core b/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr_pkg.core index 8e1a50993813d..71f2f55d20c1f 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr_pkg.core +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_clkmgr_pkg:0.1 +name: lowrisc:englishbreakfast_ip:clkmgr_pkg:0.1 description: "Top specific clock manager package" virtual: - - lowrisc:ip_interfaces:clkmgr_pkg + - lowrisc:virtual_ip:clkmgr_pkg filesets: files_rtl: diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr_reg.core b/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr_reg.core index 75054bc297e11..86856f86c0c0c 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr_reg.core +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/clkmgr_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_clkmgr_reg:0.1 +name: lowrisc:englishbreakfast_ip:clkmgr_reg:0.1 description: "Clock manager registers" filesets: diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/data/top_englishbreakfast_clkmgr.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/clkmgr/data/top_englishbreakfast_clkmgr.ipconfig.hjson index bb877e4e9a59c..f7d7c7ed2777f 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/data/top_englishbreakfast_clkmgr.ipconfig.hjson +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/data/top_englishbreakfast_clkmgr.ipconfig.hjson @@ -239,5 +239,9 @@ pwrmgr_vlnv_prefix: top_englishbreakfast_ top_pkg_vlnv: lowrisc:constants:top_englishbreakfast_top_pkg topname: englishbreakfast + uniquified_modules: + { + rv_plic: rv_plic + } } } diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/clkmgr_sim.core b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/clkmgr_sim.core index 06cf747760ef2..6e62a903ab37e 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/clkmgr_sim.core +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/clkmgr_sim.core @@ -2,17 +2,17 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_clkmgr_sim:0.1 +name: lowrisc:englishbreakfast_dv:clkmgr_sim:0.1 description: "CLKMGR DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_englishbreakfast_clkmgr + - lowrisc:englishbreakfast_ip:clkmgr files_dv: depend: - - lowrisc:opentitan:top_englishbreakfast_clkmgr_test:0.1 - - lowrisc:opentitan:top_englishbreakfast_clkmgr_sva:0.1 + - lowrisc:englishbreakfast_dv:clkmgr_test:0.1 + - lowrisc:englishbreakfast_dv:clkmgr_sva:0.1 files: - tb.sv - cov/clkmgr_cov_bind.sv diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson index a7e4fa2d82b51..7bc5cafb30786 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_englishbreakfast_clkmgr_sim:0.1 + fusesoc_core: lowrisc:englishbreakfast_dv:clkmgr_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/clkmgr_testplan.hjson" diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/env/clkmgr_env.core b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/env/clkmgr_env.core index dc69c9c6605f6..5024de920f80f 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/env/clkmgr_env.core +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/env/clkmgr_env.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_clkmgr_env:0.1 +name: lowrisc:englishbreakfast_dv:clkmgr_env:0.1 description: "CLKMGR DV UVM environment" filesets: files_dv: depend: - lowrisc:dv:ralgen - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg - - lowrisc:opentitan:top_englishbreakfast_clkmgr_pkg + - lowrisc:englishbreakfast_ip:pwrmgr_pkg + - lowrisc:englishbreakfast_ip:clkmgr_pkg - lowrisc:constants:top_englishbreakfast_top_pkg files: - clkmgr_csrs_if.sv diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core index 7c744565e7b30..e50b1f52089c8 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/sva/clkmgr_sva.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_clkmgr_sva:0.1 +name: lowrisc:englishbreakfast_dv:clkmgr_sva:0.1 description: "CLKMGR assertion modules and bind file." filesets: files_dv: depend: - lowrisc:tlul:headers - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_englishbreakfast_clkmgr_sva_ifs:0.1 + - lowrisc:englishbreakfast_dv:clkmgr_sva_ifs:0.1 files: - clkmgr_bind.sv - clkmgr_sec_cm_checker_assert.sv @@ -17,7 +17,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_englishbreakfast_clkmgr + - lowrisc:englishbreakfast_ip:clkmgr generate: csr_assert_gen: diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core index 9372bca8ac684..153774b1edba5 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/sva/clkmgr_sva_ifs.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_clkmgr_sva_ifs:0.1 +name: lowrisc:englishbreakfast_dv:clkmgr_sva_ifs:0.1 description: "CLKMGR SVA interfaces." filesets: files_dv: diff --git a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/tests/clkmgr_test.core b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/tests/clkmgr_test.core index 10c1f96ef9e8c..6e813725007cc 100644 --- a/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/tests/clkmgr_test.core +++ b/hw/top_englishbreakfast/ip_autogen/clkmgr/dv/tests/clkmgr_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_clkmgr_test:0.1 +name: lowrisc:englishbreakfast_dv:clkmgr_test:0.1 description: "CLKMGR DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_englishbreakfast_clkmgr_env:0.1 + - lowrisc:englishbreakfast_dv:clkmgr_env:0.1 files: - clkmgr_test_pkg.sv - clkmgr_base_test.sv: {is_include_file: true} diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/data/top_englishbreakfast_flash_ctrl.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/data/top_englishbreakfast_flash_ctrl.ipconfig.hjson index 3a9526df87ec4..aa3fe569b6f55 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/data/top_englishbreakfast_flash_ctrl.ipconfig.hjson +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/data/top_englishbreakfast_flash_ctrl.ipconfig.hjson @@ -26,5 +26,9 @@ pwrmgr_vlnv_prefix: top_englishbreakfast_ top_pkg_vlnv: lowrisc:constants:top_englishbreakfast_top_pkg topname: englishbreakfast + uniquified_modules: + { + rv_plic: rv_plic + } } } diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/cov/flash_ctrl_cov.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/cov/flash_ctrl_cov.core index f9dcbf461aeb0..73e3e30377c20 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/cov/flash_ctrl_cov.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/cov/flash_ctrl_cov.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_cov +name: lowrisc:englishbreakfast_dv:flash_ctrl_cov description: "FLASH_CTRL functional coverage interface & bind." filesets: files_dv: depend: - lowrisc:dv:dv_utils - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl + - lowrisc:englishbreakfast_ip:flash_ctrl files: - flash_ctrl_cov_bind.sv - flash_ctrl_phy_cov_if.sv diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core index 323bbc1c34d2a..e0ce0eb4bb2b5 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/env/flash_ctrl_bkdr_util.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_bkdr_util:0.1 +name: lowrisc:englishbreakfast_dv:flash_ctrl_bkdr_util:0.1 description: "Backdoor read/write flash memory for DV" filesets: @@ -13,7 +13,7 @@ filesets: - lowrisc:dv:crypto_dpi_prince:0.1 - lowrisc:dv:crypto_dpi_present:0.1 - lowrisc:prim:secded:0.1 - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_pkg + - lowrisc:englishbreakfast_ip:flash_ctrl_pkg - lowrisc:dv:mem_bkdr_util files: - flash_ctrl_bkdr_util_pkg.sv diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/env/flash_ctrl_env.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/env/flash_ctrl_env.core index 7499886ff37f5..684256581124c 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/env/flash_ctrl_env.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/env/flash_ctrl_env.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_env:0.1 +name: lowrisc:englishbreakfast_dv:flash_ctrl_env:0.1 description: "FLASH_CTRL DV UVM environment" filesets: files_dv: @@ -11,10 +11,10 @@ filesets: - lowrisc:dv:dv_base_reg - lowrisc:dv:dv_lib - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_bkdr_util + - lowrisc:englishbreakfast_dv:flash_ctrl_bkdr_util - lowrisc:dv:flash_phy_prim_agent - lowrisc:dv:mem_bkdr_util - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_pkg + - lowrisc:englishbreakfast_ip:flash_ctrl_pkg - lowrisc:constants:top_englishbreakfast_top_pkg files: - flash_ctrl_eflash_ral_pkg.sv diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson index ccb3368730578..0ea1c10bb1ddc 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_base_sim_cfg.hjson @@ -12,7 +12,7 @@ tb: tb // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_sim:0.1 + fusesoc_core: lowrisc:englishbreakfast_dv:flash_ctrl_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/flash_ctrl_testplan.hjson" diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_sim.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_sim.core index 32f46da584f7d..01fbc6abb8d63 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_sim.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/flash_ctrl_sim.core @@ -2,22 +2,22 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_sim:0.1 +name: lowrisc:englishbreakfast_dv:flash_ctrl_sim:0.1 description: "FLASH_CTRL DV sim target" filesets: files_rtl: depend: - lowrisc:ip:tlul - lowrisc:constants:top_englishbreakfast_top_pkg - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl:0.1 + - lowrisc:englishbreakfast_ip:flash_ctrl:0.1 file_type: systemVerilogSource files_dv: depend: - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_bkdr_util - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_test - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_sva - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_cov + - lowrisc:englishbreakfast_dv:flash_ctrl_bkdr_util + - lowrisc:englishbreakfast_dv:flash_ctrl_test + - lowrisc:englishbreakfast_dv:flash_ctrl_sva + - lowrisc:englishbreakfast_dv:flash_ctrl_cov files: - tb/tb.sv file_type: systemVerilogSource diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/sva/flash_ctrl_sva.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/sva/flash_ctrl_sva.core index 3c41c1c52994a..84ec6dcdbe48e 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/sva/flash_ctrl_sva.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/sva/flash_ctrl_sva.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_sva:0.1 +name: lowrisc:englishbreakfast_dv:flash_ctrl_sva:0.1 description: "FLASH_CTRL assertion modules and bind file." filesets: files_dv: depend: - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_pkg + - lowrisc:englishbreakfast_ip:flash_ctrl_pkg - lowrisc:tlul:headers - lowrisc:fpv:csr_assert_gen files: @@ -17,7 +17,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl + - lowrisc:englishbreakfast_ip:flash_ctrl generate: csr_assert_gen: diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/tests/flash_ctrl_test.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/tests/flash_ctrl_test.core index 8320666d817fb..9b0c1e0007afa 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/tests/flash_ctrl_test.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/dv/tests/flash_ctrl_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_test:0.1 +name: lowrisc:englishbreakfast_dv:flash_ctrl_test:0.1 description: "FLASH_CTRL DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_env + - lowrisc:englishbreakfast_dv:flash_ctrl_env files: - flash_ctrl_test_pkg.sv - flash_ctrl_base_test.sv: {is_include_file: true} diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl.core index 41d8d60ac49c3..23831dbf8a158 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl:0.1 +name: lowrisc:englishbreakfast_ip:flash_ctrl:0.1 description: "Flash Controller" filesets: @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:secded - lowrisc:prim:sparse_fsm - lowrisc:ip:otp_ctrl_pkg - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_pkg - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_reg + - lowrisc:englishbreakfast_ip:flash_ctrl_pkg + - lowrisc:englishbreakfast_ip:flash_ctrl_reg - lowrisc:constants:top_englishbreakfast_top_pkg - lowrisc:ip:jtag_pkg files: diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_pkg.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_pkg.core index 04f04f72eb7ad..12e87641ae05a 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_pkg.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_pkg:0.1 +name: lowrisc:englishbreakfast_ip:flash_ctrl_pkg:0.1 description: "Top specific flash package" virtual: - - lowrisc:ip_interfaces:flash_ctrl_pkg + - lowrisc:virtual_ip:flash_ctrl_pkg filesets: files_rtl: @@ -13,7 +13,7 @@ filesets: - lowrisc:constants:top_englishbreakfast_top_pkg - lowrisc:prim:util - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg + - lowrisc:englishbreakfast_ip:pwrmgr_pkg - lowrisc:ip:jtag_pkg - lowrisc:ip:edn_pkg - lowrisc:tlul:headers diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_prim_reg_top.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_prim_reg_top.core index 185cdabad2106..8550ceea1aa90 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_prim_reg_top.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_prim_reg_top.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_prim_reg_top:1.0 +name: lowrisc:englishbreakfast_ip:flash_ctrl_prim_reg_top:1.0 description: "Generic register top for the FLASH wrapper" virtual: - - lowrisc:ip_interfaces:flash_ctrl_prim_reg_top + - lowrisc:virtual_ip:flash_ctrl_prim_reg_top filesets: files_rtl: depend: - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_pkg + - lowrisc:englishbreakfast_ip:flash_ctrl_pkg files: - rtl/flash_ctrl_prim_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_reg.core b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_reg.core index df63deb7811df..8184f2bba80ae 100644 --- a/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_reg.core +++ b/hw/top_englishbreakfast/ip_autogen/flash_ctrl/flash_ctrl_reg.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_flash_ctrl_reg:0.1 +name: lowrisc:englishbreakfast_ip:flash_ctrl_reg:0.1 description: "Flash registers" filesets: files_rtl: depend: - lowrisc:ip:tlul - - lowrisc:opentitan:top_englishbreakfast_flash_ctrl_pkg + - lowrisc:englishbreakfast_ip:flash_ctrl_pkg files: - rtl/flash_ctrl_core_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_englishbreakfast/ip_autogen/pinmux/data/top_englishbreakfast_pinmux.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/pinmux/data/top_englishbreakfast_pinmux.ipconfig.hjson index 82e1a32e6028c..9d4563c4adfd0 100644 --- a/hw/top_englishbreakfast/ip_autogen/pinmux/data/top_englishbreakfast_pinmux.ipconfig.hjson +++ b/hw/top_englishbreakfast/ip_autogen/pinmux/data/top_englishbreakfast_pinmux.ipconfig.hjson @@ -18,5 +18,9 @@ top_pkg_vlnv: lowrisc:constants:top_englishbreakfast_top_pkg scan_role_pkg_vlnv: lowrisc:systems:top_englishbreakfast_scan_role_pkg topname: englishbreakfast + uniquified_modules: + { + rv_plic: rv_plic + } } } diff --git a/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core b/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core index d03515b797955..7496f8ecaccbe 100644 --- a/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core +++ b/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_chip_fpv.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pinmux_chip_fpv:0.1 +name: lowrisc:englishbreakfast_systems:pinmux_chip_fpv:0.1 description: "pinmux FPV target with chip_earlgrey parameters" filesets: @@ -13,9 +13,9 @@ filesets: - lowrisc:ip:jtag_pkg - lowrisc:prim:mubi_pkg - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_englishbreakfast_pinmux:0.1 + - lowrisc:englishbreakfast_ip:pinmux:0.1 - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_englishbreakfast_pinmux_common_fpv:0.1 + - lowrisc:englishbreakfast_fpv:pinmux_common_fpv:0.1 - lowrisc:constants:top_englishbreakfast_top_pkg - lowrisc:systems:top_englishbreakfast_scan_role_pkg files: diff --git a/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_common_fpv.core b/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_common_fpv.core index 5f837ecd336ba..749885a944183 100644 --- a/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_common_fpv.core +++ b/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_common_fpv.core @@ -2,14 +2,14 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pinmux_common_fpv:0.1 +name: lowrisc:englishbreakfast_fpv:pinmux_common_fpv:0.1 description: "pinmux common FPV target" filesets: files_formal: depend: - lowrisc:prim:all - lowrisc:ip:tlul - - lowrisc:opentitan:top_englishbreakfast_pinmux:0.1 + - lowrisc:englishbreakfast_ip:pinmux:0.1 files: - vip/pinmux_assert_fpv.sv - tb/pinmux_bind_fpv.sv diff --git a/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_fpv.core b/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_fpv.core index 3e613448e9bc8..440930eb53f21 100644 --- a/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_fpv.core +++ b/hw/top_englishbreakfast/ip_autogen/pinmux/fpv/pinmux_fpv.core @@ -2,16 +2,16 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pinmux_fpv:0.1 +name: lowrisc:englishbreakfast_fpv:pinmux_fpv:0.1 description: "pinmux FPV target" filesets: files_formal: depend: - lowrisc:prim:all - lowrisc:ip:tlul - - lowrisc:opentitan:top_englishbreakfast_pinmux:0.1 + - lowrisc:englishbreakfast_ip:pinmux:0.1 - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_englishbreakfast_pinmux_common_fpv + - lowrisc:englishbreakfast_fpv:pinmux_common_fpv files: - tb/pinmux_tb.sv file_type: systemVerilogSource diff --git a/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux.core b/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux.core index 350d795e680c1..c9a2291f7e592 100644 --- a/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux.core +++ b/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pinmux:0.1 +name: lowrisc:englishbreakfast_ip:pinmux:0.1 description: "Pin Multiplexer" filesets: @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:pad_attr - lowrisc:ip:jtag_pkg - lowrisc:ip:usbdev - - lowrisc:opentitan:top_englishbreakfast_pinmux_reg:0.1 - - lowrisc:opentitan:top_englishbreakfast_pinmux_pkg:0.1 + - lowrisc:englishbreakfast_ip:pinmux_reg:0.1 + - lowrisc:englishbreakfast_ip:pinmux_pkg:0.1 files: - rtl/pinmux_wkup.sv - rtl/pinmux_jtag_buf.sv diff --git a/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux_pkg.core b/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux_pkg.core index 39e76cb8da10f..fecc79b5293e1 100644 --- a/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux_pkg.core +++ b/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pinmux_pkg:0.1 +name: lowrisc:englishbreakfast_ip:pinmux_pkg:0.1 description: "Pinmux package" virtual: - - lowrisc:ip_interfaces:pinmux_pkg + - lowrisc:virtual_ip:pinmux_pkg filesets: files_rtl: diff --git a/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux_reg.core b/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux_reg.core index 161f7df7ff203..7a482efa9c1f9 100644 --- a/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux_reg.core +++ b/hw/top_englishbreakfast/ip_autogen/pinmux/pinmux_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pinmux_reg:0.1 +name: lowrisc:englishbreakfast_ip:pinmux_reg:0.1 description: "Auto-generated pinmux register sources" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:ip:tlul - lowrisc:prim:subreg - - lowrisc:opentitan:top_englishbreakfast_pinmux_pkg + - lowrisc:englishbreakfast_ip:pinmux_pkg files: - rtl/pinmux_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_englishbreakfast/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson b/hw/top_englishbreakfast/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson index 28a2e8acaf38c..4e88b385160a0 100644 --- a/hw/top_englishbreakfast/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson +++ b/hw/top_englishbreakfast/ip_autogen/pinmux/syn/pinmux_syn_cfg.hjson @@ -6,7 +6,7 @@ name: pinmux // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_englishbreakfast_pinmux:0.1 + fusesoc_core: lowrisc:englishbreakfast_ip:pinmux:0.1 import_cfgs: [// Project wide common synthesis config file "{proj_root}/hw/syn/tools/dvsim/common_syn_cfg.hjson"], diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/data/top_englishbreakfast_pwrmgr.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/pwrmgr/data/top_englishbreakfast_pwrmgr.ipconfig.hjson index f1a2a2e1bfd7f..da9dcb48f0876 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/data/top_englishbreakfast_pwrmgr.ipconfig.hjson +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/data/top_englishbreakfast_pwrmgr.ipconfig.hjson @@ -62,5 +62,9 @@ NumRomInputs: 1 top_pkg_vlnv: lowrisc:constants:top_englishbreakfast_top_pkg topname: englishbreakfast + uniquified_modules: + { + rv_plic: rv_plic + } } } diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core index a4949119e41e1..ff74112a53f4b 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/env/pwrmgr_env.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pwrmgr_env:0.1 +name: lowrisc:englishbreakfast_dv:pwrmgr_env:0.1 description: "PWRMGR DV UVM environment" filesets: files_dv: @@ -10,7 +10,7 @@ filesets: - lowrisc:dv:ralgen - lowrisc:dv:cip_lib - lowrisc:ip:rv_core_ibex_pkg - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg + - lowrisc:englishbreakfast_ip:pwrmgr_pkg - lowrisc:constants:top_englishbreakfast_top_pkg files: - pwrmgr_env_pkg.sv diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/pwrmgr_sim.core b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/pwrmgr_sim.core index 63f81c3200bbb..0709e6acb8bc0 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/pwrmgr_sim.core +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/pwrmgr_sim.core @@ -2,17 +2,17 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pwrmgr_sim:0.1 +name: lowrisc:englishbreakfast_dv:pwrmgr_sim:0.1 description: "PWRMGR DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_englishbreakfast_pwrmgr:0.1 + - lowrisc:englishbreakfast_ip:pwrmgr:0.1 files_dv: depend: - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_test:0.1 - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_sva:0.1 - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_unit_only_sva:0.1 + - lowrisc:englishbreakfast_dv:pwrmgr_test:0.1 + - lowrisc:englishbreakfast_dv:pwrmgr_sva:0.1 + - lowrisc:englishbreakfast_dv:pwrmgr_unit_only_sva:0.1 files: - tb.sv - cov/pwrmgr_cov_bind.sv diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson index c0dbeecc54817..a4092c33d6100 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/pwrmgr_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_englishbreakfast_pwrmgr_sim:0.1 + fusesoc_core: lowrisc:englishbreakfast_dv:pwrmgr_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/pwrmgr_testplan.hjson" diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core index 8a5268ef5d041..3977296387352 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/sva/pwrmgr_sva.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pwrmgr_sva:0.1 +name: lowrisc:englishbreakfast_dv:pwrmgr_sva:0.1 description: "PWRMGR assertion modules and bind file." filesets: files_dv: @@ -11,7 +11,7 @@ filesets: - lowrisc:fpv:csr_assert_gen - lowrisc:dv:clkmgr_pwrmgr_sva_if - lowrisc:dv:pwrmgr_rstmgr_sva_if:0.1 - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg + - lowrisc:englishbreakfast_ip:pwrmgr_pkg files: - pwrmgr_bind.sv - pwrmgr_clock_enables_sva_if.sv @@ -21,7 +21,7 @@ filesets: files_formal: depend: - - lowrisc:opentitan:top_englishbreakfast_pwrmgr:0.1 + - lowrisc:englishbreakfast_ip:pwrmgr:0.1 generate: csr_assert_gen: diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core index b044ac8b788f1..257b887d85d58 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/sva/pwrmgr_unit_only_sva.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pwrmgr_unit_only_sva:0.1 +name: lowrisc:englishbreakfast_dv:pwrmgr_unit_only_sva:0.1 description: "PWRMGR assertion interfaces not suitable for chip level bind file." filesets: files_dv: @@ -10,8 +10,8 @@ filesets: - lowrisc:tlul:headers - lowrisc:fpv:csr_assert_gen - lowrisc:dv:pwrmgr_rstmgr_sva_if - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg:0.1 - - lowrisc:opentitan:top_englishbreakfast_pwrmgr:0.1 + - lowrisc:englishbreakfast_ip:pwrmgr_pkg:0.1 + - lowrisc:englishbreakfast_ip:pwrmgr:0.1 files: - pwrmgr_unit_only_bind.sv diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core index 7fd778fb54644..90eb063147c93 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/dv/tests/pwrmgr_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pwrmgr_test:0.1 +name: lowrisc:englishbreakfast_dv:pwrmgr_test:0.1 description: "PWRMGR DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_env:0.1 + - lowrisc:englishbreakfast_dv:pwrmgr_env:0.1 files: - pwrmgr_test_pkg.sv - pwrmgr_base_test.sv: {is_include_file: true} diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr.core b/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr.core index ca7a375cf9d10..6d798260f0fd3 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr.core +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pwrmgr:0.1 +name: lowrisc:englishbreakfast_ip:pwrmgr:0.1 description: "Power manager RTL" filesets: @@ -20,8 +20,8 @@ filesets: - lowrisc:prim:mubi - lowrisc:prim:clock_buf - lowrisc:prim:measure - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg:0.1 - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_reg:0.1 + - lowrisc:englishbreakfast_ip:pwrmgr_pkg:0.1 + - lowrisc:englishbreakfast_ip:pwrmgr_reg:0.1 files: - rtl/pwrmgr_cdc.sv - rtl/pwrmgr_slow_fsm.sv diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr_pkg.core b/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr_pkg.core index 7efedab736090..5b7062abab7e1 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr_pkg.core +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr_pkg.core @@ -2,10 +2,10 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg:0.1 +name: lowrisc:englishbreakfast_ip:pwrmgr_pkg:0.1 description: "Power manager package" virtual: - - lowrisc:ip_interfaces:pwrmgr_pkg + - lowrisc:virtual_ip:pwrmgr_pkg filesets: files_rtl: diff --git a/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr_reg.core b/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr_reg.core index 3fb99a5fe2783..9dabd7e81fe8d 100644 --- a/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr_reg.core +++ b/hw/top_englishbreakfast/ip_autogen/pwrmgr/pwrmgr_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_pwrmgr_reg:0.1 +name: lowrisc:englishbreakfast_ip:pwrmgr_reg:0.1 description: "Power manager registers" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:ip:tlul - lowrisc:prim:subreg - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg + - lowrisc:englishbreakfast_ip:pwrmgr_pkg files: - rtl/pwrmgr_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/data/top_englishbreakfast_rstmgr.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/rstmgr/data/top_englishbreakfast_rstmgr.ipconfig.hjson index ef2beda7699e7..c03c6b05d488e 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/data/top_englishbreakfast_rstmgr.ipconfig.hjson +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/data/top_englishbreakfast_rstmgr.ipconfig.hjson @@ -455,5 +455,9 @@ pwrmgr_vlnv_prefix: top_englishbreakfast_ top_pkg_vlnv: lowrisc:constants:top_englishbreakfast_top_pkg topname: englishbreakfast + uniquified_modules: + { + rv_plic: rv_plic + } } } diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/env/rstmgr_env.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/env/rstmgr_env.core index 69cd54b89bcd8..235fdf18fd414 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/env/rstmgr_env.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/env/rstmgr_env.core @@ -2,18 +2,18 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr_env:0.1 +name: lowrisc:englishbreakfast_dv:rstmgr_env:0.1 description: "RSTMGR DV UVM environment" filesets: files_rtl: depend: - - lowrisc:opentitan:top_englishbreakfast_rstmgr + - lowrisc:englishbreakfast_ip:rstmgr files_dv: depend: - lowrisc:dv:ralgen - lowrisc:dv:cip_lib - - lowrisc:opentitan:top_englishbreakfast_rstmgr_pkg + - lowrisc:englishbreakfast_ip:rstmgr_pkg - lowrisc:constants:top_englishbreakfast_top_pkg files: diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core index d6fa3b19a7431..ae0f70612dc98 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr_cnsty_chk_sim:0.1 +name: lowrisc:englishbreakfast_dv:rstmgr_cnsty_chk_sim:0.1 description: "Rstmgr_cnsty_chk DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_englishbreakfast_rstmgr_cnsty_chk:0.1 + - lowrisc:englishbreakfast_ip:rstmgr_cnsty_chk:0.1 - lowrisc:dv:sec_cm file_type: systemVerilogSource diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson index 108a3c2055d75..1fedd8a43ee76 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_cnsty_chk/rstmgr_cnsty_chk_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_englishbreakfast_rstmgr_cnsty_chk_sim:0.1 + fusesoc_core: lowrisc:englishbreakfast_dv:rstmgr_cnsty_chk_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/data/rstmgr_cnsty_chk_testplan.hjson" diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_sim.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_sim.core index 9edbcbd955fde..5471952052884 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_sim.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_sim.core @@ -2,17 +2,17 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr_sim:0.1 +name: lowrisc:englishbreakfast_dv:rstmgr_sim:0.1 description: "RSTMGR DV sim target" filesets: files_rtl: depend: - - lowrisc:opentitan:top_englishbreakfast_rstmgr + - lowrisc:englishbreakfast_ip:rstmgr files_dv: depend: - - lowrisc:opentitan:top_englishbreakfast_rstmgr_test:0.1 - - lowrisc:opentitan:top_englishbreakfast_rstmgr_sva:0.1 + - lowrisc:englishbreakfast_dv:rstmgr_test:0.1 + - lowrisc:englishbreakfast_dv:rstmgr_sva:0.1 files: - tb.sv - cov/rstmgr_cov_bind.sv diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson index 7865f569bd99e..32b23603171fd 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/rstmgr_sim_cfg.hjson @@ -15,7 +15,7 @@ tool: vcs // Fusesoc core file used for building the file list. - fusesoc_core: lowrisc:opentitan:top_englishbreakfast_rstmgr_sim:0.1 + fusesoc_core: lowrisc:englishbreakfast_dv:rstmgr_sim:0.1 // Testplan hjson file. testplan: "{self_dir}/../data/rstmgr_testplan.hjson" diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core index 3658315be88f0..571a96bd1c8db 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/sva/rstmgr_sva.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr_sva:0.1 +name: lowrisc:englishbreakfast_dv:rstmgr_sva:0.1 description: "RSTMGR assertion modules and bind file." filesets: files_dv: depend: - lowrisc:prim:mubi - - lowrisc:opentitan:top_englishbreakfast_rstmgr_pkg:0.1 + - lowrisc:englishbreakfast_ip:rstmgr_pkg:0.1 - lowrisc:fpv:csr_assert_gen - - lowrisc:opentitan:top_englishbreakfast_rstmgr_sva_ifs:0.1 + - lowrisc:englishbreakfast_dv:rstmgr_sva_ifs:0.1 files: - rstmgr_bind.sv diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core index 070c91154c995..ce0675f3b4ca9 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/sva/rstmgr_sva_ifs.core @@ -2,15 +2,15 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr_sva_ifs:0.1 +name: lowrisc:englishbreakfast_dv:rstmgr_sva_ifs:0.1 description: "RSTMGR cascading resets assertion interface." filesets: files_dv: depend: - lowrisc:ip:lc_ctrl_pkg - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg + - lowrisc:englishbreakfast_ip:pwrmgr_pkg - lowrisc:dv:pwrmgr_rstmgr_sva_if - - lowrisc:opentitan:top_englishbreakfast_rstmgr + - lowrisc:englishbreakfast_ip:rstmgr files: - rstmgr_attrs_sva_if.sv diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/tests/rstmgr_test.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/tests/rstmgr_test.core index 94e6f3932d1b4..587857bd104c9 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/tests/rstmgr_test.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/dv/tests/rstmgr_test.core @@ -2,12 +2,12 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr_test:0.1 +name: lowrisc:englishbreakfast_dv:rstmgr_test:0.1 description: "RSTMGR DV UVM test" filesets: files_dv: depend: - - lowrisc:opentitan:top_englishbreakfast_rstmgr_env:0.1 + - lowrisc:englishbreakfast_dv:rstmgr_env:0.1 files: - rstmgr_test_pkg.sv - rstmgr_base_test.sv: {is_include_file: true} diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr.core index 88118c7b4e88a..ed4560cfde246 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr:0.1 +name: lowrisc:englishbreakfast_ip:rstmgr:0.1 description: "Reset manager RTL" filesets: files_rtl: depend: - - lowrisc:opentitan:top_earlgrey_alert_handler_pkg + - lowrisc:englishbreakfast_ip:alert_handler_pkg - lowrisc:ip:rv_core_ibex_pkg - lowrisc:ip:tlul - lowrisc:prim:clock_mux2 @@ -17,9 +17,9 @@ filesets: - lowrisc:prim:mubi - lowrisc:prim:clock_buf - lowrisc:prim:sparse_fsm - - lowrisc:opentitan:top_englishbreakfast_rstmgr_pkg:0.1 - - lowrisc:opentitan:top_englishbreakfast_rstmgr_reg:0.1 - - lowrisc:opentitan:top_englishbreakfast_rstmgr_cnsty_chk:0.1 + - lowrisc:englishbreakfast_ip:rstmgr_pkg:0.1 + - lowrisc:englishbreakfast_ip:rstmgr_reg:0.1 + - lowrisc:englishbreakfast_ip:rstmgr_cnsty_chk:0.1 files: - rtl/rstmgr_ctrl.sv - rtl/rstmgr_por.sv diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_cnsty_chk.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_cnsty_chk.core index 3d16d11a955f9..d32377a7a1ffe 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_cnsty_chk.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_cnsty_chk.core @@ -3,7 +3,7 @@ CAPI=2: # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr_cnsty_chk:0.1 +name: lowrisc:englishbreakfast_ip:rstmgr_cnsty_chk:0.1 description: "Rstmgr consistency checker" filesets: files_rtl: @@ -11,7 +11,7 @@ filesets: - lowrisc:prim:all - lowrisc:prim:sparse_fsm - lowrisc:ip:rv_core_ibex_pkg - - lowrisc:opentitan:top_englishbreakfast_rstmgr_pkg + - lowrisc:englishbreakfast_ip:rstmgr_pkg files: - rtl/rstmgr_cnsty_chk.sv file_type: systemVerilogSource diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_pkg.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_pkg.core index 2c072b4fe0bcc..2aacd19240c1f 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_pkg.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_pkg.core @@ -2,15 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr_pkg:0.1 +name: lowrisc:englishbreakfast_ip:rstmgr_pkg:0.1 description: "Reset manager package" -virtual: - - lowrisc:ip_interfaces:rstmgr_pkg filesets: files_rtl: depend: - - lowrisc:opentitan:top_englishbreakfast_pwrmgr_pkg + - lowrisc:englishbreakfast_ip:pwrmgr_pkg files: - rtl/rstmgr_reg_pkg.sv - rtl/rstmgr_pkg.sv diff --git a/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_reg.core b/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_reg.core index e7895c2179f85..88bb29c88dbe2 100644 --- a/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_reg.core +++ b/hw/top_englishbreakfast/ip_autogen/rstmgr/rstmgr_reg.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rstmgr_reg:0.1 +name: lowrisc:englishbreakfast_ip:rstmgr_reg:0.1 description: "Reset manager registers" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:tlul:headers - lowrisc:prim:subreg - - lowrisc:opentitan:top_englishbreakfast_rstmgr_pkg + - lowrisc:englishbreakfast_ip:rstmgr_pkg files: - rtl/rstmgr_reg_top.sv file_type: systemVerilogSource diff --git a/hw/top_englishbreakfast/ip_autogen/rv_plic/data/top_englishbreakfast_rv_plic.ipconfig.hjson b/hw/top_englishbreakfast/ip_autogen/rv_plic/data/top_englishbreakfast_rv_plic.ipconfig.hjson index e87fecec272ae..9c2730690cbf0 100644 --- a/hw/top_englishbreakfast/ip_autogen/rv_plic/data/top_englishbreakfast_rv_plic.ipconfig.hjson +++ b/hw/top_englishbreakfast/ip_autogen/rv_plic/data/top_englishbreakfast_rv_plic.ipconfig.hjson @@ -10,5 +10,9 @@ target: 1 prio: 3 topname: englishbreakfast + uniquified_modules: + { + rv_plic: rv_plic + } } } diff --git a/hw/top_englishbreakfast/ip_autogen/rv_plic/fpv/rv_plic_fpv.core b/hw/top_englishbreakfast/ip_autogen/rv_plic/fpv/rv_plic_fpv.core index 18a7980c0e6da..def082b9233f8 100644 --- a/hw/top_englishbreakfast/ip_autogen/rv_plic/fpv/rv_plic_fpv.core +++ b/hw/top_englishbreakfast/ip_autogen/rv_plic/fpv/rv_plic_fpv.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rv_plic_fpv:0.1 +name: lowrisc:englishbreakfast_ip:rv_plic_fpv:0.1 description: "FPV for RISC-V PLIC" filesets: @@ -10,7 +10,7 @@ filesets: depend: - lowrisc:ip:tlul - lowrisc:prim:all - - lowrisc:opentitan:top_englishbreakfast_rv_plic + - lowrisc:englishbreakfast_ip:rv_plic - lowrisc:fpv:csr_assert_gen files: - tb/rv_plic_bind_fpv.sv @@ -24,7 +24,7 @@ generate: generator: csr_assert_gen parameters: spec: ../data/rv_plic.hjson - depend: lowrisc:opentitan:top_englishbreakfast_rv_plic + depend: lowrisc:englishbreakfast_ip:rv_plic targets: default: &default_target diff --git a/hw/top_englishbreakfast/ip_autogen/rv_plic/rv_plic.core b/hw/top_englishbreakfast/ip_autogen/rv_plic/rv_plic.core index 3dd4bc1955e8d..6b52e13b821ab 100644 --- a/hw/top_englishbreakfast/ip_autogen/rv_plic/rv_plic.core +++ b/hw/top_englishbreakfast/ip_autogen/rv_plic/rv_plic.core @@ -2,13 +2,13 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rv_plic:0.1 +name: lowrisc:englishbreakfast_ip:rv_plic:0.1 description: "RISC-V Platform Interrupt Controller (PLIC)" filesets: files_rtl: depend: - - lowrisc:opentitan:top_englishbreakfast_rv_plic_component:0.1 + - lowrisc:englishbreakfast_ip:rv_plic_component:0.1 - lowrisc:ip:tlul - lowrisc:prim:subreg files: diff --git a/hw/top_englishbreakfast/ip_autogen/rv_plic/rv_plic_component.core b/hw/top_englishbreakfast/ip_autogen/rv_plic/rv_plic_component.core index 25010a1cb4545..0a5b5e991e41a 100644 --- a/hw/top_englishbreakfast/ip_autogen/rv_plic/rv_plic_component.core +++ b/hw/top_englishbreakfast/ip_autogen/rv_plic/rv_plic_component.core @@ -2,7 +2,7 @@ CAPI=2: # Copyright lowRISC contributors (OpenTitan project). # Licensed under the Apache License, Version 2.0, see LICENSE for details. # SPDX-License-Identifier: Apache-2.0 -name: lowrisc:opentitan:top_englishbreakfast_rv_plic_component:0.1 +name: lowrisc:englishbreakfast_ip:rv_plic_component:0.1 description: "RISC-V Platform Interrupt Controller (PLIC)" filesets: diff --git a/util/ipgen/renderer.py b/util/ipgen/renderer.py index b051a92d59e99..f5e4de4c69304 100644 --- a/util/ipgen/renderer.py +++ b/util/ipgen/renderer.py @@ -98,20 +98,30 @@ def _get_mako_template_lookup(self) -> MakoTemplateLookup: strict_undefined=True) return self._lookup - def _tplfunc_instance_vlnv(self, template_vlnv_str: str, prefix: str = None) -> str: + def get_uniquified_name(self, name: str) -> str: + """Return the uniquified name or None if the name is not uniquified""" + return self.ip_config.param_values["uniquified_modules"].get(name) + + def replace_uniquified_prefix(self, core_name: str) -> str: + uniquified_modules = self.ip_config.param_values["uniquified_modules"] + for name, uniq_name in uniquified_modules.items(): + if core_name.startswith(f'{name}_'): + return f'{uniq_name}_{core_name[len(name)+1:]}' + else: + return core_name + + def _tplfunc_instance_vlnv(self, + template_vlnv_str: str, + prefix: str = None) -> str: """Makes a vlnv into an instance specific one. A vlnv is a string of the form vendor:library:name[:version] where the version is optional. This is transformed as follows: - The vendor string becomes `lowrisc`. - - The library string becomes `opentitan`. + - The library string becomes `topname`_``. - The name is processed as follows: - - If the `module_instance_name` parameter exists, the name must start - with it as a prefix, and that is replaced by the `instance_name` - value. - - If the name starts with the template name, it is replaced by the - `instance_name` value. - - Otherwise the `instance_name` is prefixed to the name. + - Any prefix ending with a '_' for which there is a uniquified name + is replaced by the uniquified name. - The optional version is preserved. Raises exceptions for malformed vlnvs. @@ -121,34 +131,23 @@ def _tplfunc_instance_vlnv(self, template_vlnv_str: str, prefix: str = None) -> raise TemplateRenderError( f"{template_vlnv_str} isn't a valid FuseSoC VLNV. " "Required format: 'vendor:library:name[:version]'") + template_library_name = template_vlnv[1] template_core_name = template_vlnv[2] template_core_version = (template_vlnv[3] if len(template_vlnv) == 4 else None) - if prefix is None: - template_core_prefix = self.ip_config.instance_name - else: - template_core_prefix = prefix - - if "module_instance_name" in self.ip_config.param_values: - if not template_core_name.startswith( - self.ip_config.param_values["module_instance_name"]): - raise TemplateRenderError( - f'The name field in {template_vlnv_str} must start with ' - f'{self.ip_config.param_values["module_instance_name"]}') - idx = len(self.ip_config.param_values["module_instance_name"]) - template_core_name = template_core_name[idx:] - elif template_core_name.startswith(self.ip_template.name): - template_core_name = template_core_name[len(self.ip_template.name - ):] - - instance_core_name = template_core_prefix + template_core_name - instance_vlnv = ['lowrisc', 'opentitan', instance_core_name] + topname = self.ip_config.param_values["topname"] + template_library_name = f"{topname}_{template_library_name}" + core_name = self.replace_uniquified_prefix(template_core_name) + instance_vlnv = ['lowrisc', template_library_name, core_name] if template_core_version is not None: instance_vlnv.append(template_core_version) - return ':'.join(instance_vlnv) + rewritten_vlnv = ':'.join(instance_vlnv) + log.info('vlnv {} renamed to {}'.format(template_vlnv_str, + rewritten_vlnv)) + return rewritten_vlnv def _render_mako_template_to_str(self, template_filepath: Path) -> str: """ Render a template and return the rendered text. """ diff --git a/util/topgen.py b/util/topgen.py index acec14280f98e..10a62dd8948d8 100755 --- a/util/topgen.py +++ b/util/topgen.py @@ -22,8 +22,8 @@ from ipgen import (IpBlockRenderer, IpConfig, IpDescriptionOnlyRenderer, IpTemplate, TemplateRenderError) from mako import exceptions -from mako.template import Template from mako.lookup import TemplateLookup +from mako.template import Template from raclgen.lib import DEFAULT_RACL_CONFIG from reggen import access, gen_rtl, gen_sec_cm_testplan, window from reggen.countermeasure import CounterMeasure @@ -67,6 +67,24 @@ IP_TEMPLATES_PATH = SRCTREE_TOP / "hw" / "ip_templates" +class UniquifiedModules(object): + """This holds the uniquified name for all uniquified modules.""" + + def __init__(self): + self.modules: Dict[str, str] = {} + + def add_module(self, name: str, uniquified_name: str): + if (name in self.modules and uniquified_name != self.modules[name]): + raise SystemExit(f"Multiple renames for module {name}") + self.modules[name] = uniquified_name + + def get_uniq_name(self, name: str) -> Optional[str]: + return self.modules.get(name) + + +uniquified_modules = UniquifiedModules() + + class IpAttrs(NamedTuple): """Hold IP block, and path to hjson.""" ip_block: IpBlock @@ -81,10 +99,12 @@ def _ipgen_render_prelude(template_name: str, topname: str, if params else template_name) top_name = f"top_{topname}" instance_name = f"{top_name}_{module_name}" - ip_template = IpTemplate.from_template_path(IP_TEMPLATES_PATH / template_name) - params.update({"topname": topname}) + params.update({ + "topname": topname, + "uniquified_modules": uniquified_modules.modules + }) try: ip_config = IpConfig(ip_template.params, instance_name, params) @@ -231,10 +251,18 @@ def generate_xbars(top: ConfigT, out_path: Path) -> None: def generate_ipgen(top: ConfigT, module: ConfigT, params: ParamsT, out_path: Path) -> None: topname = top["name"] + template_name = module["template_type"] module_name = module["type"] module_instance_name = params.get("module_instance_name") - - assert not module_instance_name or module_instance_name == module_name + if module_instance_name and module_instance_name != module_name: + raise ValueError( + f"Unexpected module_instance_name: expected {module_name}, got " + f"{module_instance_name}") + uniq_name = uniquified_modules.get_uniq_name(template_name) + if uniq_name and uniq_name != module_instance_name: + raise ValueError( + f"Unexpected uniquified name: expected {module_instance_name}, " + f"got {uniq_name}") ipgen_render(module["template_type"], topname, params, out_path) @@ -292,6 +320,7 @@ def _get_alert_handler_params(top: ConfigT) -> ParamsT: int(alert["lpg_idx"]))) lpg_prev_offset += max(alert['lpg_idx'] for alert in alerts) + 1 module = lib.find_module(top["module"], "alert_handler") + uniquified_modules.add_module(module["template_type"], module["type"]) return { "module_instance_name": module["type"], @@ -346,6 +375,7 @@ def _get_rv_plic_params(top: ConfigT) -> ParamsT: num_srcs = sum( [int(x["width"]) if "width" in x else 1 for x in top["interrupt"]]) + 1 num_cores = int(top["num_cores"], 0) if "num_cores" in top else 1 + uniquified_modules.add_module(module["template_type"], module["type"]) return { "module_instance_name": module["type"], "src": num_srcs, @@ -487,10 +517,9 @@ def _get_clkmgr_params(top: ConfigT) -> ParamsT: OrderedDict({name: vars(obj) for name, obj in clocks.srcs.items()}), "derived_clks": - OrderedDict({ - name: vars(obj) - for name, obj in clocks.derived_srcs.items() - }), + OrderedDict( + {name: vars(obj) + for name, obj in clocks.derived_srcs.items()}), "typed_clocks": OrderedDict({ty: d for ty, d in typed_clks.items() if d}), @@ -700,10 +729,11 @@ def _get_ac_range_check_params(top: ConfigT) -> ParamsT: } # Get the AC Range Check instance - ac_ranges = lib.find_module(top['module'], 'ac_range_check') + module = lib.find_module(top['module'], 'ac_range_check') + uniquified_modules.add_module(module["template_type"], module["type"]) params = { - "num_ranges": ac_ranges["ipgen_param"]["num_ranges"], - "module_instance_name": ac_ranges["type"] + "num_ranges": module["ipgen_param"]["num_ranges"], + "module_instance_name": module["type"] } params.update(racl_params) return params @@ -719,13 +749,13 @@ def generate_ac_range_check(top: ConfigT, module: ConfigT, def _get_racl_params(top: ConfigT) -> ParamsT: """Extracts parameters for racl_ctrl ipgen.""" - racl_ctrl = lib.find_module(top["module"], "racl_ctrl") + module = lib.find_module(top["module"], "racl_ctrl") if len(top["racl"]["policies"]) == 1: # If there is only one set of policies, take the first one policies = list(top["racl"]["policies"].values())[0] else: # More than one policy, we need to find the matching set of policies - racl_group = racl_ctrl["racl_group"] + racl_group = module["racl_group"] policies = top["racl"]["policies"][racl_group] num_subscribing_ips = defaultdict(int) @@ -735,8 +765,10 @@ def _get_racl_params(top: ConfigT) -> ParamsT: racl_group = racl_mappings[if_name]["racl_group"] num_subscribing_ips[racl_group] += 1 + uniquified_modules.add_module(module["template_type"], module["type"]) + return { - "module_instance_name": racl_ctrl["type"], + "module_instance_name": module["type"], "nr_role_bits": top["racl"]["nr_role_bits"], "nr_ctn_uid_bits": top["racl"]["nr_ctn_uid_bits"], "nr_policies": len(policies), @@ -1076,8 +1108,7 @@ def insert_ip_attrs(module: ConfigT, params: ParamsT): insert_ip_attrs(instance, _get_flash_ctrl_params(topcfg)) if "otp_ctrl" in ipgen_instances: instance = ipgen_instances["otp_ctrl"][0] - insert_ip_attrs(instance, - _get_otp_ctrl_params(topcfg, cfg_path)) + insert_ip_attrs(instance, _get_otp_ctrl_params(topcfg, cfg_path)) if "ac_range_check" in ipgen_instances: instance = ipgen_instances["ac_range_check"][0] insert_ip_attrs(instance, _get_ac_range_check_params(topcfg)) @@ -1649,7 +1680,8 @@ def render_template(template_path: str, rendered_path: Path, topcfg=completecfg, racl_config=racl_config) render_template(TOPGEN_TEMPLATE_PATH / 'toplevel_racl_pkg.sv.tpl', - out_path / 'rtl' / 'autogen' / f'top_{topname}_racl_pkg.sv', + out_path / 'rtl' / 'autogen' / + f'top_{topname}_racl_pkg.sv', gencmd=gencmd_sv, topcfg=completecfg, racl_config=racl_config)