Skip to content

Commit cedddf9

Browse files
committed
[bazel] Rename the cloud_kms token label
1. Rename the `cloud_kms` token label to `cloud_kms_sival` and deprecate the old name. 2. Fix the `hello_world` demo to build as a sival ROM_EXT target. Signed-off-by: Chris Frantz <[email protected]>
1 parent bc08f24 commit cedddf9

File tree

2 files changed

+21
-1
lines changed
  • signing/tokens
  • sw/device/examples/hello_world

2 files changed

+21
-1
lines changed

signing/tokens/BUILD

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,31 @@ signing_tool(
2323
tool = "//sw/host/hsmtool",
2424
)
2525

26+
# TODO(lowrisc#22428): Remove this target once everyone has started using `cloud_kms_sival`.
2627
signing_tool(
2728
name = "cloud_kms",
2829
data = [
2930
"earlgrey_z1_sival.yaml",
3031
"@cloud_kms_hsm//:libkmsp11",
3132
],
33+
deprecation = "Please use the token `//signing/tokens:cloud_kms_sival`.",
34+
env = {
35+
# The Cloud KMS PKCS11 provider needs to know where the user's home
36+
# is in order to load the gclould credentials.
37+
"HOME": ENV["HOME"],
38+
"HSMTOOL_MODULE": "$(location @cloud_kms_hsm//:libkmsp11)",
39+
"KMS_PKCS11_CONFIG": "$(location earlgrey_z1_sival.yaml)",
40+
},
41+
location = "token",
42+
tool = "//sw/host/hsmtool",
43+
)
44+
45+
signing_tool(
46+
name = "cloud_kms_sival",
47+
data = [
48+
"earlgrey_z1_sival.yaml",
49+
"@cloud_kms_hsm//:libkmsp11",
50+
],
3251
env = {
3352
# The Cloud KMS PKCS11 provider needs to know where the user's home
3453
# is in order to load the gclould credentials.

sw/device/examples/hello_world/BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ opentitan_binary(
2020
"//hw/top_earlgrey:fpga_cw310",
2121
"//hw/top_earlgrey:sim_dv",
2222
"//hw/top_earlgrey:sim_verilator",
23+
# For some reason, this target makes englishbreakfast builds fail.
24+
#"//hw/top_earlgrey:silicon_owner_sival_rom_ext",
2325
],
2426
deps = [
2527
":hello_world_lib",
@@ -43,7 +45,6 @@ cc_library(
4345
"//sw/device/lib/runtime:print",
4446
"//sw/device/lib/testing:pinmux_testutils",
4547
"//sw/device/lib/testing/test_framework:check",
46-
"//sw/device/lib/testing/test_framework:ottf_ld_silicon_creator_slot_a",
4748
"//sw/device/lib/testing/test_framework:ottf_start",
4849
"//sw/device/lib/testing/test_framework:ottf_test_config",
4950
],

0 commit comments

Comments
 (0)