commit e99015e644d03768a616d463f4f8c991f07f3bb3
author Miguel Osorio <miguelosorio@google.com> Mon Jan 24 18:12:10 2022 -0800
committer moidx <migue48@gmail.com> Tue Jan 25 12:01:04 2022 -0800
tree 3b66bd93c41b4a8354f1608c2bc60f0ac5ff5278
parent 9384c5541e47376fa156d234c3aa4b46ef4acb9c

[sw/rom] Update bazel rules

1. Remove abs and sec_mmio dependencies from their respective mock
   functions.
2. Add OPENTITAN_CPU target to libraries that depend on target specific
   definitions.
3. Fix build issues with sigverify OTBN rules.

Signed-off-by: Miguel Osorio <miguelosorio@google.com>

sw/device/silicon_creator/lib/BUILD

diff --git a/sw/device/silicon_creator/lib/BUILD b/sw/device/silicon_creator/lib/BUILD
index 1b12794..4a90179 100644
--- a/sw/device/silicon_creator/lib/BUILD
+++ b/sw/device/silicon_creator/lib/BUILD
@@ -352,6 +352,7 @@
 cc_library(
     name = "sigverify",
     srcs = ["sigverify.c"],
+    target_compatible_with = [OPENTITAN_CPU],
     deps = [
         ":sigverify_internal",
         ":sigverify_intf",
@@ -423,6 +424,8 @@
     deps = [
         ":sigverify",
         ":sigverify_testvectors",
+        ":sigverify_mod_exp_ibex",
+        ":sigverify_mod_exp_otbn",
         ":test_main",
         "//sw/device/silicon_creator/lib/base:sec_mmio",
     ],
@@ -440,6 +443,7 @@
 cc_library(
     name = "sigverify_mod_exp_otbn",
     srcs = ["sigverify_mod_exp_otbn.c"],
+    target_compatible_with = [OPENTITAN_CPU],
     deps = [
         ":error",
         ":otbn_util",

sw/device/silicon_creator/lib/base/BUILD

diff --git a/sw/device/silicon_creator/lib/base/BUILD b/sw/device/silicon_creator/lib/base/BUILD
index 88486f3..c90eba2 100644
--- a/sw/device/silicon_creator/lib/base/BUILD
+++ b/sw/device/silicon_creator/lib/base/BUILD
@@ -40,9 +40,11 @@
 cc_library(
     name = "mock_abs_mmio",
     testonly = True,
-    hdrs = ["mock_abs_mmio.h"],
+    hdrs = [
+        "abs_mmio.h",
+        "mock_abs_mmio.h",
+    ],
     deps = [
-        ":abs_mmio",
         "//sw/device/lib/base/testing",
         "//sw/device/silicon_creator/testing:mask_rom_test",
         "@googletest//:gtest",
@@ -63,9 +65,11 @@
 cc_library(
     name = "mock_sec_mmio",
     testonly = True,
-    hdrs = ["mock_sec_mmio.h"],
+    hdrs = [
+        "mock_sec_mmio.h",
+        "sec_mmio.h",
+    ],
     deps = [
-        ":sec_mmio",
         "//sw/device/lib/base/testing",
         "//sw/device/silicon_creator/testing:mask_rom_test",
         "@googletest//:gtest",

sw/device/silicon_creator/lib/drivers/BUILD

diff --git a/sw/device/silicon_creator/lib/drivers/BUILD b/sw/device/silicon_creator/lib/drivers/BUILD
index 3bf7027..32f7d21 100644
--- a/sw/device/silicon_creator/lib/drivers/BUILD
+++ b/sw/device/silicon_creator/lib/drivers/BUILD
@@ -89,8 +89,10 @@
     deps = [
         "//hw/ip/flash_ctrl/data:flash_ctrl_regs",
         "//hw/ip/otp_ctrl/data:otp_ctrl_regs",
+        "//hw/top_earlgrey/sw/autogen:top_earlgrey",
         "//sw/device/lib/base",
         "//sw/device/lib/base/testing",
+        "//sw/device/silicon_creator/lib:error",
         "//sw/device/silicon_creator/lib/base:mock_abs_mmio",
         "//sw/device/silicon_creator/lib/base:mock_sec_mmio",
         "//sw/device/silicon_creator/lib/drivers:mock_otp",
@@ -261,9 +263,11 @@
 cc_library(
     name = "mock_otp",
     testonly = True,
-    hdrs = ["mock_otp.h"],
+    hdrs = [
+        "mock_otp.h",
+        "otp.h"
+    ],
     deps = [
-        ":otp",
         "//sw/device/silicon_creator/testing:mask_rom_test",
         "@googletest//:gtest",
     ],