[ibex] Exclude Ibex's lowrisc_ip vendor files
Excluding these files when vendoring ibex prevents someone accidentally
bringing the `vendor/lowrisc_ip` directory back using the vendor tool.
Signed-off-by: Sam Elliott <selliott@lowrisc.org>
diff --git a/hw/vendor/lowrisc_ibex.vendor.hjson b/hw/vendor/lowrisc_ibex.vendor.hjson
index dea1b6f..941c669 100644
--- a/hw/vendor/lowrisc_ibex.vendor.hjson
+++ b/hw/vendor/lowrisc_ibex.vendor.hjson
@@ -16,8 +16,11 @@
// fusesoc picks up isn't deterministic so two copies can be problematic
'shared',
// vendor/lowrisc_ip contains things from the OpenTitan repository, leaving
- // it in can cause conflicts
+ // it in can cause conflicts. We also remove the vendor configuration so it
+ // cannot accidentally be brought back by util/vendor.py.
'vendor/lowrisc_ip',
+ 'vendor/lowrisc_ip.vendor.hjson',
+ 'vendor/lowrisc_ip.lock.hjson',
// We shouldn't reformat upstream code
'.clang-format',
]
diff --git a/hw/vendor/lowrisc_ibex/vendor/lowrisc_ip.lock.hjson b/hw/vendor/lowrisc_ibex/vendor/lowrisc_ip.lock.hjson
deleted file mode 100644
index 3d2e312..0000000
--- a/hw/vendor/lowrisc_ibex/vendor/lowrisc_ip.lock.hjson
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-// This file is generated by the util/vendor script. Please do not modify it
-// manually.
-
-{
- upstream:
- {
- url: https://github.com/lowRISC/opentitan
- rev: 249b4c316cd6626d13e17edd8a52ca60c004af96
- }
-}
diff --git a/hw/vendor/lowrisc_ibex/vendor/lowrisc_ip.vendor.hjson b/hw/vendor/lowrisc_ibex/vendor/lowrisc_ip.vendor.hjson
deleted file mode 100644
index 3e3710d..0000000
--- a/hw/vendor/lowrisc_ibex/vendor/lowrisc_ip.vendor.hjson
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-{
- name: "lowrisc_ip",
- target_dir: "lowrisc_ip",
-
- upstream: {
- url: "https://github.com/lowRISC/opentitan"
- rev: "master"
- }
-
- mapping: [
- {from: "hw/dv/sv/common_ifs", to: "common_ifs"},
- {from: "hw/dv/sv/csr_utils", to: "csr_utils"},
- {from: "hw/dv/sv/dv_lib", to: "dv_lib"},
- {from: "hw/dv/sv/dv_utils", to: "dv_utils"},
- {from: "hw/dv/verilator", to: "dv_verilator"},
-
- {from: "hw/ip/prim", to: "prim"},
- {from: "hw/ip/prim_generic", to: "prim_generic"},
- {from: "hw/ip/prim_xilinx", to: "prim_xilinx"},
-
- {from: "hw/lint", to: "lint"},
-
- {from: "util/dvsim", to: "dvsim"},
- {from: "util/uvmdvgen", to: "uvmdvgen"},
- ]
-}
