[lib] Don't make anything in lib depend on the base:base rule
This excludes a couple of deprecated targets that aren't worth fixing.
Signed-off-by: Miguel Young de la Sota <mcyoung@google.com>
diff --git a/rules/opentitan.bzl b/rules/opentitan.bzl
index 49beaf2..b148195 100644
--- a/rules/opentitan.bzl
+++ b/rules/opentitan.bzl
@@ -640,7 +640,9 @@
_OTTF_DEPS = [
"//sw/device/lib/arch:device",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:macros",
+ "//sw/device/lib/base:csr",
+ "//sw/device/lib/base:mmio",
"//sw/device/lib/runtime:hart",
"//sw/device/lib/runtime:log",
"//sw/device/lib/runtime:print",
diff --git a/sw/device/lib/BUILD b/sw/device/lib/BUILD
index 5c1eeb7..7b3a1b4 100644
--- a/sw/device/lib/BUILD
+++ b/sw/device/lib/BUILD
@@ -40,7 +40,7 @@
deps = [
"//hw/ip/rv_core_ibex/data:rv_core_ibex_regs",
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:mmio",
],
)
@@ -50,7 +50,7 @@
hdrs = ["irq.h"],
target_compatible_with = [OPENTITAN_CPU],
deps = [
- "//sw/device/lib/base",
+ "//sw/device/lib/base:csr",
],
)
@@ -69,7 +69,6 @@
deps = [
"//hw/ip/usbdev/data:usbdev_regs",
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
- "//sw/device/lib/base",
],
)
@@ -78,7 +77,5 @@
srcs = ["usb_simpleserial.c"],
hdrs = ["usb_simpleserial.h"],
target_compatible_with = [OPENTITAN_CPU],
- deps = [
- ":usb",
- ],
+ deps = [":usb"],
)
diff --git a/sw/device/lib/base/testing/BUILD b/sw/device/lib/base/testing/BUILD
index 11b9253..8f6cdbb 100644
--- a/sw/device/lib/base/testing/BUILD
+++ b/sw/device/lib/base/testing/BUILD
@@ -20,7 +20,7 @@
"MOCK_MMIO=1",
],
deps = [
- "//sw/device/lib/base",
+ "//sw/device/lib/base:mmio",
"@googletest//:gtest",
],
)
diff --git a/sw/device/lib/crypto/drivers/BUILD b/sw/device/lib/crypto/drivers/BUILD
index b9f7504..6db6634 100644
--- a/sw/device/lib/crypto/drivers/BUILD
+++ b/sw/device/lib/crypto/drivers/BUILD
@@ -13,7 +13,10 @@
deps = [
"//hw/ip/hmac/data:hmac_regs",
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:bitfield",
+ "//sw/device/lib/base:macros",
+ "//sw/device/lib/base:memory",
+ "//sw/device/lib/base:mmio",
],
)
@@ -24,6 +27,7 @@
deps = [
"//hw/ip/otbn/data:otbn_regs",
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:bitfield",
+ "//sw/device/lib/base:mmio",
],
)
diff --git a/sw/device/lib/crypto/ecdsa_p256/BUILD b/sw/device/lib/crypto/ecdsa_p256/BUILD
index fc72dcc..4ae9465 100644
--- a/sw/device/lib/crypto/ecdsa_p256/BUILD
+++ b/sw/device/lib/crypto/ecdsa_p256/BUILD
@@ -12,7 +12,7 @@
hdrs = ["ecdsa_p256.h"],
target_compatible_with = [OPENTITAN_CPU],
deps = [
- "//sw/device/lib/base",
+ "//sw/device/lib/base:hardened",
"//sw/device/lib/crypto:otbn_util",
"//sw/device/lib/crypto/drivers:otbn",
"//sw/otbn/crypto:p256_ecdsa",
diff --git a/sw/device/lib/crypto/rsa_3072/BUILD b/sw/device/lib/crypto/rsa_3072/BUILD
index 7c4fa06..522d171 100644
--- a/sw/device/lib/crypto/rsa_3072/BUILD
+++ b/sw/device/lib/crypto/rsa_3072/BUILD
@@ -12,7 +12,9 @@
hdrs = ["rsa_3072_verify.h"],
target_compatible_with = [OPENTITAN_CPU],
deps = [
- "//sw/device/lib/base",
+ "//sw/device/lib/base:hardened",
+ "//sw/device/lib/base:macros",
+ "//sw/device/lib/base:memory",
"//sw/device/lib/crypto:otbn_util",
"//sw/device/lib/crypto/drivers:hmac",
"//sw/device/lib/crypto/drivers:otbn",
diff --git a/sw/device/lib/runtime/BUILD b/sw/device/lib/runtime/BUILD
index e4f11d4..8274e88 100644
--- a/sw/device/lib/runtime/BUILD
+++ b/sw/device/lib/runtime/BUILD
@@ -24,7 +24,7 @@
deps = [
":ibex",
"//sw/device/lib/arch:device",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:stdasm",
"//sw/device/lib/base/freestanding",
],
)
@@ -36,7 +36,8 @@
target_compatible_with = [OPENTITAN_CPU],
deps = [
"//sw/device/lib/arch:device",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:csr",
+ "//sw/device/lib/base:stdasm",
],
)
@@ -47,7 +48,9 @@
target_compatible_with = [OPENTITAN_CPU],
deps = [
"//sw/device/lib/arch:device",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:macros",
+ "//sw/device/lib/base:memory",
+ "//sw/device/lib/base:mmio",
"//sw/device/lib/base/freestanding",
"//sw/device/lib/runtime:print",
],
@@ -70,7 +73,8 @@
target_compatible_with = [OPENTITAN_CPU],
textual_hdrs = ["pmp_regions.def"],
deps = [
- "//sw/device/lib/base",
+ "//sw/device/lib/base:bitfield",
+ "//sw/device/lib/base:csr",
"//sw/device/lib/base/freestanding",
],
)
@@ -80,7 +84,8 @@
srcs = ["print.c"],
hdrs = ["print.h"],
deps = [
- "//sw/device/lib/base",
+ "//sw/device/lib/base:macros",
+ "//sw/device/lib/base:memory",
"//sw/device/lib/dif:uart",
],
)
diff --git a/sw/device/lib/testing/test_framework/BUILD b/sw/device/lib/testing/test_framework/BUILD
index e1fa932..d030f75 100644
--- a/sw/device/lib/testing/test_framework/BUILD
+++ b/sw/device/lib/testing/test_framework/BUILD
@@ -23,7 +23,7 @@
deps = [
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
"//sw/device/lib/arch:device",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:mmio",
"//sw/device/lib/dif:uart",
"//sw/device/lib/runtime:hart",
"//sw/device/lib/runtime:log",
@@ -69,7 +69,6 @@
":check",
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
"//sw/device/lib:irq",
- "//sw/device/lib/base",
"//sw/device/lib/dif:rv_timer",
"//sw/device/lib/dif:uart",
"//sw/device/lib/runtime:hart",
@@ -101,7 +100,8 @@
"ottf.ld",
"//hw/top_earlgrey/sw/autogen:linker_script",
"//sw/device:info_sections",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:csr",
+ "//sw/device/lib/base:macros",
"//sw/device/lib/crt",
"//sw/device/lib/runtime:hart",
"//sw/device/lib/runtime:log",
@@ -132,7 +132,6 @@
":freertos_port",
":test_framework",
"//sw/device/lib:irq",
- "//sw/device/lib/base",
"//sw/device/lib/runtime:hart",
"//sw/device/lib/runtime:ibex",
"//sw/device/lib/runtime:log",
diff --git a/sw/device/lib/testing/test_rom/BUILD b/sw/device/lib/testing/test_rom/BUILD
index 2bf9a0d..158b327 100644
--- a/sw/device/lib/testing/test_rom/BUILD
+++ b/sw/device/lib/testing/test_rom/BUILD
@@ -46,7 +46,7 @@
"//sw/device:info_sections",
"//sw/device/lib:ibex_peri",
"//sw/device/lib:pinmux",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:mmio",
"//sw/device/lib/crt",
"//sw/device/lib/dif:gpio",
"//sw/device/lib/dif:hmac",
@@ -73,7 +73,8 @@
"//hw/top_earlgrey/sw/autogen:top_earlgrey",
"//sw/device/lib:flash_ctrl",
"//sw/device/lib/arch:device",
- "//sw/device/lib/base",
+ "//sw/device/lib/base:memory",
+ "//sw/device/lib/base:mmio",
"//sw/device/lib/dif:gpio",
"//sw/device/lib/dif:hmac",
"//sw/device/lib/dif:spi_device",
@@ -85,9 +86,5 @@
opentitan_functest(
name = "test_rom_test",
- srcs = [
- "test_rom_test.c",
- ],
- deps = [
- ],
+ srcs = ["test_rom_test.c"],
)
