Skip to content

Commit 867c06a

Browse files
cfrantzpamaury
authored andcommitted
[bazel] Clean up exec_env_filegroup
1. Make exec_env_filegroup return a DefaultInfo provider so it may be consumed by other filegroup/packaging rules. 2. Remove `perso_bins` filegroup in favor of `ft_personalize_sival`. Signed-off-by: Chris Frantz <[email protected]>
1 parent 2a272c5 commit 867c06a

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

rules/opentitan/cc.bzl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,12 +586,21 @@ def _exec_env_filegroup(ctx):
586586
fail("The set of files and exec_envs must be matched: files =", fset.keys(), ", exec_env =", eset.keys())
587587

588588
result = []
589+
default_files = []
589590
for k in files.keys():
590591
provider = exec_env[k][ExecEnvInfo].provider
591592
f = files[k].files.to_list()
592593
if len(f) != 1:
593594
fail("files[{}] must supply exactly one file".format(k))
595+
596+
# Return the exec_env's provider so this rule can be consumed by
597+
# opentitan_test rules.
594598
result.append(provider(default = f[0], kind = ctx.attr.kind))
599+
default_files.append(f[0])
600+
601+
# Also return a DefaultInfo provider so this rule can be consumed by other
602+
# filegroup or packaging rules.
603+
result.append(DefaultInfo(files = depset(default_files)))
595604
return result
596605

597606
exec_env_filegroup = rule(

sw/device/silicon_creator/manuf/base/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ filegroup(
393393
":ft_fw_bundle_{}".format(sku)
394394
for sku in EARLGREY_SKUS.keys()
395395
] + [
396-
"//sw/device/silicon_creator/manuf/base/binaries:perso_bins",
396+
"//sw/device/silicon_creator/manuf/base/binaries:ft_personalize_sival",
397397
],
398398
)
399399

sw/device/silicon_creator/manuf/base/binaries/BUILD

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ load("//rules/opentitan:cc.bzl", "exec_env_filegroup")
66

77
package(default_visibility = ["//visibility:public"])
88

9-
filegroup(
10-
name = "perso_bins",
11-
srcs = [
12-
],
13-
)
14-
159
exec_env_filegroup(
1610
name = "ft_personalize_sival",
1711
testonly = True,

0 commit comments

Comments
 (0)