Squash version of lowRISC#25580

Signed-off-by: Amaury Pouly <[email protected]>
pamaury · Jan 7, 2025 · 1d7e2ca · 1d7e2ca
1 parent 1dc0bad
commit 1d7e2ca
Show file tree

Hide file tree

Showing 151 changed files with 1,439 additions and 1,419 deletions.
diff --git a/hw/ip/adc_ctrl/data/BUILD b/hw/ip/adc_ctrl/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "adc_ctrl_c_regs",
-    srcs = [
-        "adc_ctrl.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "adc_ctrl_rust_regs",
-    srcs = [
-        "adc_ctrl.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/adc_ctrl/defs.bzl b/hw/ip/adc_ctrl/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+ADC_CTRL = opentitan_ip(
+    name = "adc_ctrl",
+    hjson = "//hw/ip/adc_ctrl/data:adc_ctrl.hjson",
+)
diff --git a/hw/ip/aes/data/BUILD b/hw/ip/aes/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "aes_c_regs",
-    srcs = [
-        "aes.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "aes_rust_regs",
-    srcs = [
-        "aes.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/aes/defs.bzl b/hw/ip/aes/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+AES = opentitan_ip(
+    name = "aes",
+    hjson = "//hw/ip/aes/data:aes.hjson",
+)
diff --git a/hw/ip/aon_timer/data/BUILD b/hw/ip/aon_timer/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "aon_timer_c_regs",
-    srcs = [
-        "aon_timer.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "aon_timer_rust_regs",
-    srcs = [
-        "aon_timer.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/aon_timer/defs.bzl b/hw/ip/aon_timer/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+AON_TIMER = opentitan_ip(
+    name = "aon_timer",
+    hjson = "//hw/ip/aon_timer/data:aon_timer.hjson",
+)
diff --git a/hw/ip/csrng/data/BUILD b/hw/ip/csrng/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "csrng_c_regs",
-    srcs = [
-        "csrng.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "csrng_rust_regs",
-    srcs = [
-        "csrng.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/csrng/defs.bzl b/hw/ip/csrng/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+CSRNG = opentitan_ip(
+    name = "csrng",
+    hjson = "//hw/ip/csrng/data:csrng.hjson",
+)
diff --git a/hw/ip/dma/data/BUILD b/hw/ip/dma/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "dma_c_regs",
-    srcs = [
-        "dma.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "dma_rust_regs",
-    srcs = [
-        "dma.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/dma/defs.bzl b/hw/ip/dma/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+DMA = opentitan_ip(
+    name = "dma",
+    hjson = "//hw/ip/dma/data:dma.hjson",
+)
diff --git a/hw/ip/edn/data/BUILD b/hw/ip/edn/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "edn_c_regs",
-    srcs = [
-        "edn.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "edn_rust_regs",
-    srcs = [
-        "edn.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/edn/defs.bzl b/hw/ip/edn/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+EDN = opentitan_ip(
+    name = "edn",
+    hjson = "//hw/ip/edn/data:edn.hjson",
+)
diff --git a/hw/ip/entropy_src/data/BUILD b/hw/ip/entropy_src/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "entropy_src_c_regs",
-    srcs = [
-        "entropy_src.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "entropy_src_rust_regs",
-    srcs = [
-        "entropy_src.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/entropy_src/defs.bzl b/hw/ip/entropy_src/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+ENTROPY_SRC = opentitan_ip(
+    name = "entropy_src",
+    hjson = "//hw/ip/entropy_src/data:entropy_src.hjson",
+)
diff --git a/hw/ip/gpio/data/BUILD b/hw/ip/gpio/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "gpio_c_regs",
-    srcs = [
-        "gpio.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "gpio_rust_regs",
-    srcs = [
-        "gpio.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/gpio/defs.bzl b/hw/ip/gpio/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+GPIO = opentitan_ip(
+    name = "gpio",
+    hjson = "//hw/ip/gpio/data:gpio.hjson",
+)
diff --git a/hw/ip/hmac/data/BUILD b/hw/ip/hmac/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "hmac_c_regs",
-    srcs = [
-        "hmac.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "hmac_rust_regs",
-    srcs = [
-        "hmac.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/hmac/defs.bzl b/hw/ip/hmac/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+HMAC = opentitan_ip(
+    name = "hmac",
+    hjson = "//hw/ip/hmac/data:hmac.hjson",
+)
diff --git a/hw/ip/i2c/data/BUILD b/hw/ip/i2c/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "i2c_c_regs",
-    srcs = [
-        "i2c.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "i2c_rust_regs",
-    srcs = [
-        "i2c.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),

diff --git a/hw/ip/i2c/defs.bzl b/hw/ip/i2c/defs.bzl
@@ -0,0 +1,9 @@
+# Copyright lowRISC contributors (OpenTitan project).
+# Licensed under the Apache License, Version 2.0, see LICENSE for details.
+# SPDX-License-Identifier: Apache-2.0
+load("//rules/opentitan:hw.bzl", "opentitan_ip")
+
+I2C = opentitan_ip(
+    name = "i2c",
+    hjson = "//hw/ip/i2c/data:i2c.hjson",
+)
diff --git a/hw/ip/keymgr/data/BUILD b/hw/ip/keymgr/data/BUILD
@@ -4,26 +4,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//rules:autogen.bzl",
-    "autogen_hjson_c_header",
-    "autogen_hjson_rust_header",
-)
-
-autogen_hjson_c_header(
-    name = "keymgr_c_regs",
-    srcs = [
-        "keymgr.hjson",
-    ],
-)
-
-autogen_hjson_rust_header(
-    name = "keymgr_rust_regs",
-    srcs = [
-        "keymgr.hjson",
-    ],
-)
-
 filegroup(
     name = "all_files",
     srcs = glob(["**"]),