[clkmgr / top] clean-up core file usage
There was some duplicated core file usage in clkmgr due to the ip / template split.
This duplicated usage was causing top_earlgrey_asic lint to break.
For now, remove the ip level core files completely because there is no plan for there to be a clkmgr block level specific DV, nor is there anyone other than top that references clkmgr_pkg.
If this changes, we need to move back to the ip level re-direct.
Signed-off-by: Timothy Chen <timothytim@google.com>
diff --git a/hw/ip/clkmgr/clkmgr.core b/hw/ip/clkmgr/clkmgr.core
deleted file mode 100644
index 7cc0b84..0000000
--- a/hw/ip/clkmgr/clkmgr.core
+++ /dev/null
@@ -1,61 +0,0 @@
-CAPI=2:
-# Copyright lowRISC contributors.
-# Licensed under the Apache License, Version 2.0, see LICENSE for details.
-# SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:ip:clkmgr:0.1"
-description: "Clock manager component without the generated portions"
-
-filesets:
- files_rtl:
- depend:
- - lowrisc:ip:tlul
- - lowrisc:prim:all
- - lowrisc:prim:clock_gating
- - lowrisc:ip:pwrmgr
- - lowrisc:ip:clkmgr_reg
- files:
- - rtl/clkmgr_pkg.sv
- - rtl/clkmgr.sv
- file_type: systemVerilogSource
-
- files_verilator_waiver:
- depend:
- # common waivers
- - lowrisc:lint:common
- - lowrisc:lint:comportable
- files:
- file_type: vlt
-
- files_ascentlint_waiver:
- depend:
- # common waivers
- - lowrisc:lint:common
- - lowrisc:lint:comportable
- files:
- - lint/clkmgr.waiver
- file_type: waiver
-
-parameters:
- SYNTHESIS:
- datatype: bool
- paramtype: vlogdefine
-
-
-targets:
- default: &default_target
- filesets:
- - tool_verilator ? (files_verilator_waiver)
- - tool_ascentlint ? (files_ascentlint_waiver)
- - files_rtl
- toplevel: clkmgr
-
- lint:
- <<: *default_target
- default_tool: verilator
- parameters:
- - SYNTHESIS=true
- tools:
- verilator:
- mode: lint-only
- verilator_options:
- - "-Wall"
diff --git a/hw/top_earlgrey/ip/ast/ast_wrapper.core b/hw/top_earlgrey/ip/ast/ast_wrapper.core
index f1a440b..195bdc0 100644
--- a/hw/top_earlgrey/ip/ast/ast_wrapper.core
+++ b/hw/top_earlgrey/ip/ast/ast_wrapper.core
@@ -13,7 +13,7 @@
- lowrisc:systems:ast_wrapper_pkg
- lowrisc:systems:ast
- lowrisc:systems:sensor_ctrl_reg
- - "fileset_top ? (lowrisc:ip:clkmgr_pkg)"
+ - lowrisc:systems:clkmgr_pkg
- "fileset_top ? (lowrisc:ip:pwrmgr_pkg)"
- "fileset_topgen ? (lowrisc:systems:topgen)"
- lowrisc:ip:rstmgr
diff --git a/hw/top_earlgrey/ip/clkmgr/clkmgr.core b/hw/top_earlgrey/ip/clkmgr/clkmgr.core
index be7bbb0..dbaa2f6 100644
--- a/hw/top_earlgrey/ip/clkmgr/clkmgr.core
+++ b/hw/top_earlgrey/ip/clkmgr/clkmgr.core
@@ -2,8 +2,8 @@
# Copyright lowRISC contributors.
# Licensed under the Apache License, Version 2.0, see LICENSE for details.
# SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:top_earlgrey:clkmgr:0.1"
-description: "Clock manager component without the generated portions"
+name: "lowrisc:systems:clkmgr:0.1"
+description: "Top specific clock manager "
filesets:
files_rtl:
@@ -14,8 +14,8 @@
- lowrisc:prim:clock_buf
- lowrisc:prim:clock_div
- lowrisc:ip:pwrmgr_pkg
+ - lowrisc:systems:clkmgr_pkg
files:
- - rtl/autogen/clkmgr_pkg.sv
- rtl/autogen/clkmgr_reg_pkg.sv
- rtl/autogen/clkmgr_reg_top.sv
- rtl/autogen/clkmgr.sv
diff --git a/hw/ip/clkmgr/clkmgr_pkg.core b/hw/top_earlgrey/ip/clkmgr/clkmgr_pkg.core
similarity index 63%
rename from hw/ip/clkmgr/clkmgr_pkg.core
rename to hw/top_earlgrey/ip/clkmgr/clkmgr_pkg.core
index d6eeaac..c8c3b25 100644
--- a/hw/ip/clkmgr/clkmgr_pkg.core
+++ b/hw/top_earlgrey/ip/clkmgr/clkmgr_pkg.core
@@ -2,18 +2,19 @@
# Copyright lowRISC contributors.
# Licensed under the Apache License, Version 2.0, see LICENSE for details.
# SPDX-License-Identifier: Apache-2.0
-name: "lowrisc:ip:clkmgr_pkg:0.1"
-description: "Clock Manager Package"
+name: "lowrisc:systems:clkmgr_pkg:0.1"
+description: "Top specific clock manager package"
filesets:
files_rtl:
depend:
- lowrisc:constants:top_pkg
+ - lowrisc:ip:pwrmgr_pkg
files:
- - rtl/clkmgr_pkg.sv
+ - rtl/autogen/clkmgr_pkg.sv
file_type: systemVerilogSource
targets:
- default:
+ default: &default_target
filesets:
- files_rtl
diff --git a/hw/top_earlgrey/top_earlgrey.core b/hw/top_earlgrey/top_earlgrey.core
index 21e7b06..41ea14e 100644
--- a/hw/top_earlgrey/top_earlgrey.core
+++ b/hw/top_earlgrey/top_earlgrey.core
@@ -8,7 +8,6 @@
files_rtl_generic:
depend:
- lowrisc:ip:uart:0.1
- - lowrisc:top_earlgrey:clkmgr
- lowrisc:ip:alert_handler
- lowrisc:ip:gpio
- lowrisc:ip:rv_core_ibex
@@ -43,6 +42,7 @@
- lowrisc:top_earlgrey:xbar_peri
- lowrisc:ip:rstmgr
- lowrisc:ip:pwrmgr
+ - lowrisc:systems:clkmgr
- lowrisc:systems:sensor_ctrl
- lowrisc:systems:ast_wrapper_pkg
- lowrisc:tlul:headers
