[rv_plic] Use instance_vlnv to construct VLNVs

Make rv_plic like the other ipgen cores and use instance_vlnv. Co-authored-by: Andreas Kurth <[email protected]> Signed-off-by: Alexander Williams <[email protected]>
lowRISC · Jan 4, 2025 · 9fd5c6d · 9fd5c6d
1 parent 9aebfc5
commit 9fd5c6d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/hw/ip_templates/rv_plic/rv_plic.core.tpl b/hw/ip_templates/rv_plic/rv_plic.core.tpl
@@ -2,16 +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
-<%
-module_name = instance_vlnv("lowrisc:ip:" + module_instance_name)
-%>\
-name: ${module_name}
+name: ${instance_vlnv("lowrisc:ip:rv_plic:0.1")}
 description: "RISC-V Platform Interrupt Controller (PLIC)"
 
 filesets:
   files_rtl:
     depend:
-      - lowrisc:ip:${module_instance_name}_component
+      - ${instance_vlnv("lowrisc:ip:rv_plic_component:0.1")}
       - lowrisc:ip:tlul
       - lowrisc:prim:subreg
     files:

diff --git a/hw/ip_templates/rv_plic/rv_plic_component.core.tpl b/hw/ip_templates/rv_plic/rv_plic_component.core.tpl
@@ -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:ip:${module_instance_name}_component:0.1"
+name: ${instance_vlnv(f"lowrisc:ip:rv_plic_component:0.1")}
 description: "RISC-V Platform Interrupt Controller (PLIC)"
 
 filesets:

diff --git 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
+name: lowrisc:opentitan:top_darjeeling_rv_plic:0.1
 description: "RISC-V Platform Interrupt Controller (PLIC)"
 
 filesets:
   files_rtl:
     depend:
-      - lowrisc:ip:rv_plic_component
+      - lowrisc:opentitan:top_darjeeling_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
@@ -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:ip:rv_plic_component:0.1"
+name: lowrisc:opentitan:top_darjeeling_rv_plic_component:0.1
 description: "RISC-V Platform Interrupt Controller (PLIC)"
 
 filesets:

diff --git 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
+name: lowrisc:opentitan:top_earlgrey_rv_plic:0.1
 description: "RISC-V Platform Interrupt Controller (PLIC)"
 
 filesets:
   files_rtl:
     depend:
-      - lowrisc:ip:rv_plic_component
+      - lowrisc:opentitan:top_earlgrey_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
@@ -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:ip:rv_plic_component:0.1"
+name: lowrisc:opentitan:top_earlgrey_rv_plic_component:0.1
 description: "RISC-V Platform Interrupt Controller (PLIC)"
 
 filesets: