[ibex] Do not vendor in duplicated top_pkg into OT
top_pkg is a global package and may appear only once in the tree. Before
this change, there were two instances of this package: one in opentitan,
and one vendored in through Ibex.
Remove the one from Ibex when vendoring in.
Fixes #2510
Signed-off-by: Philipp Wagner <phw@lowrisc.org>
diff --git a/hw/vendor/lowrisc_ibex.vendor.hjson b/hw/vendor/lowrisc_ibex.vendor.hjson
index 941c669..681c5ce 100644
--- a/hw/vendor/lowrisc_ibex.vendor.hjson
+++ b/hw/vendor/lowrisc_ibex.vendor.hjson
@@ -23,5 +23,8 @@
'vendor/lowrisc_ip.lock.hjson',
// We shouldn't reformat upstream code
'.clang-format',
+ // top_pkg uses a global identifier any may appear only once in the tree.
+ 'dv/uvm/icache/dv/top_pkg.sv',
+ 'dv/uvm/icache/dv/top_pkg.core',
]
}
diff --git a/hw/vendor/lowrisc_ibex/dv/uvm/icache/dv/top_pkg.core b/hw/vendor/lowrisc_ibex/dv/uvm/icache/dv/top_pkg.core
deleted file mode 100644
index b9aacee..0000000
--- a/hw/vendor/lowrisc_ibex/dv/uvm/icache/dv/top_pkg.core
+++ /dev/null
@@ -1,20 +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
-
-# XXX: This name is currently required as global identifier until we have
-# support for "interfaces" or a similar concept.
-# Tracked in https://github.com/olofk/fusesoc/issues/235
-name: "lowrisc:constants:top_pkg"
-description: "Toplevel-wide constants needed for dv_utils"
-filesets:
- files_rtl:
- files:
- - top_pkg.sv
- file_type: systemVerilogSource
-
-targets:
- default:
- filesets:
- - files_rtl
diff --git a/hw/vendor/lowrisc_ibex/dv/uvm/icache/dv/top_pkg.sv b/hw/vendor/lowrisc_ibex/dv/uvm/icache/dv/top_pkg.sv
deleted file mode 100644
index 01f6246..0000000
--- a/hw/vendor/lowrisc_ibex/dv/uvm/icache/dv/top_pkg.sv
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-//
-
-package top_pkg;
-
-localparam TL_AW=32;
-localparam TL_DW=32; // = TL_DBW * 8; TL_DBW must be a power-of-two
-localparam TL_AIW=8; // a_source, d_source
-localparam TL_DIW=1; // d_sink
-localparam TL_DUW=16; // d_user
-localparam TL_DBW=(TL_DW>>3);
-localparam TL_SZW=$clog2($clog2(TL_DBW)+1);
-localparam FLASH_BANKS=2;
-localparam FLASH_PAGES_PER_BANK=256;
-localparam FLASH_WORDS_PER_PAGE=256;
-localparam FLASH_BYTES_PER_WORD=4;
-localparam FLASH_BKW = $clog2(FLASH_BANKS);
-localparam FLASH_PGW = $clog2(FLASH_PAGES_PER_BANK);
-localparam FLASH_WDW = $clog2(FLASH_WORDS_PER_PAGE);
-localparam FLASH_AW = FLASH_BKW + FLASH_PGW + FLASH_WDW;
-localparam FLASH_DW = FLASH_BYTES_PER_WORD * 8;
-
-endpackage
