[bazel] fix bug in filegroup

Multiple copies of a fake-signed and real-signed perso binaries were
getting copied to the orchestrator.zip package which was causing errors
downstream as the fake-signed sival perso images were overwriting the
real-signed perso binaries.

Signed-off-by: Tim Trippel <[email protected]>
(cherry picked from commit c6db441)

Author: timothytrippel

sw/device/silicon_creator/manuf/base/BUILD

@@ -4,10 +4,6 @@
 
 load("@//rules:manuf.bzl", "device_id_header")
 load("@//rules:signing.bzl", "offline_presigning_artifacts", "offline_signature_attach")
-load(
-    "@provisioning_exts//:cfg.bzl",
-    "EXT_SIGNED_PERSO_BINS",
-)
 load("//rules:const.bzl", "CONST", "hex")
 load("//rules:manifest.bzl", "manifest")
 load("//rules/opentitan:cc.bzl", "opentitan_binary_assemble")
@@ -391,15 +387,24 @@ manifest(d = {
 filegroup(
     name = "ft_personalize_all",
     testonly = True,
-    srcs = [
-               ":ft_personalize_{}".format(sku)
-               for sku in EARLGREY_SKUS.keys()
-           ] +
-           [
-               ":ft_fw_bundle_{}".format(sku)
-               for sku in EARLGREY_SKUS.keys()
-           ] + ["//sw/device/silicon_creator/manuf/base/binaries:ft_personalize_sival"] +
-           EXT_SIGNED_PERSO_BINS,
+    # The depset(...).to_list() syntax removes duplicate bazel targets. Some
+    # SKUs have duplicate "staging" versions that are identical to their
+    # production counterparts, including the perso binaries used, except for CA
+    # keys, so we need to remove duplicates.
+    srcs = depset([
+                      # Select pre-signed / checked-in perso binaries over ones
+                      # built on the fly with fake keys if a pre-signed one
+                      # exists.
+                      config.get(
+                          "perso_bin",
+                          ":ft_personalize_{}".format(sku),
+                      )
+                      for sku, config in EARLGREY_SKUS.items()
+                  ] +
+                  [
+                      ":ft_fw_bundle_{}".format(sku)
+                      for sku in EARLGREY_SKUS.keys()
+                  ]).to_list(),
 )
 
 [

sw/device/silicon_creator/manuf/base/provisioning_inputs.bzl

@@ -16,8 +16,6 @@ EARLGREY_OTP_CFGS = {
     "em00": "//hw/top_earlgrey/data/otp/emulation:otp_consts",
 } | EXT_EARLGREY_OTP_CFGS
 
-EXT_SIGNED_PERSO_BINS = []
-
 # A dictionary of SKU configurations that will be used to generate FT
 # personalization binaries that configure OTP and flash info pages as defined
 # in these bazel targets.

sw/device/silicon_creator/manuf/extensions/cfg.bzl

@@ -25,8 +25,6 @@ EXT_EARLGREY_SKUS = {
     # }
 }
 
-EXT_SIGNED_PERSO_BINS = []
-
 # This enables downstream integrators to define external Earlgrey execution
 # environments. See the upstream Silicon Owner execution environments defined
 # in the `EARLGREY_SILICON_OWNER_ROM_EXT_ENVS` dictionary in