Skip to content

Commit e753492

Browse files
[manuf] check owner FW boot message after perso
This updates the FT provisioning flow to check the owner firmware boots successfully after perso runs. Signed-off-by: Tim Trippel <[email protected]>
1 parent 5c91217 commit e753492

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

sw/device/silicon_creator/manuf/base/BUILD

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,11 @@ manifest(d = {
346346
]
347347

348348
_FT_PROVISIONING_CMD_ARGS = """
349-
--elf={sram_ft_individualize}
350-
--bootstrap={ft_personalize}
351-
--second-bootstrap={bundle}
352-
--ca-config={ca_config}
349+
--elf={{sram_ft_individualize}}
350+
--bootstrap={{ft_personalize}}
351+
--second-bootstrap={{bundle}}
352+
--ca-config={{ca_config}}
353+
--owner-success-text="{owner_fw_boot_str}"
353354
""" + FT_PROVISIONING_INPUTS
354355

355356
_FT_PROVISIONING_HARNESS = "//sw/host/provisioning/ft:ft_{}"
@@ -424,7 +425,9 @@ filegroup(
424425
"lc_test_locked0",
425426
"manuf",
426427
] + (["manual"] if config.get("offline", False) else []),
427-
test_cmd = _FT_PROVISIONING_CMD_ARGS,
428+
test_cmd = _FT_PROVISIONING_CMD_ARGS.format(
429+
owner_fw_boot_str = config.get("owner_fw_boot_str", ""),
430+
),
428431
test_harness = _FT_PROVISIONING_HARNESS.format(sku),
429432
),
430433
silicon = silicon_params(
@@ -447,7 +450,9 @@ filegroup(
447450
owner_slot_b = OWNER_SLOTS["b"],
448451
rom_ext_slot_a = SLOTS["a"],
449452
rom_ext_slot_b = SLOTS["b"],
450-
test_cmd = _FT_PROVISIONING_CMD_ARGS,
453+
test_cmd = _FT_PROVISIONING_CMD_ARGS.format(
454+
owner_fw_boot_str = config.get("owner_fw_boot_str", ""),
455+
),
451456
test_harness = _FT_PROVISIONING_HARNESS.format(sku),
452457
),
453458
)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ EARLGREY_SKUS = {
3333
"ownership_libs": ["//sw/device/silicon_creator/lib/ownership:test_owner"],
3434
"rom_ext": "//sw/device/silicon_creator/rom_ext:rom_ext_dice_x509_slot_b",
3535
"owner_fw": "//sw/device/silicon_owner/bare_metal:bare_metal_slot_b",
36+
"owner_fw_boot_str": "Bare metal PASS!",
3637
"ecdsa_key": {},
3738
"orchestrator_cfg": "@//sw/host/provisioning/orchestrator/configs/skus:emulation.hjson",
3839
},
@@ -47,6 +48,7 @@ EARLGREY_SKUS = {
4748
"ownership_libs": ["//sw/device/silicon_creator/lib/ownership:test_owner"],
4849
"rom_ext": "//sw/device/silicon_creator/rom_ext:rom_ext_dice_cwt_slot_b",
4950
"owner_fw": "//sw/device/silicon_owner/bare_metal:bare_metal_slot_b",
51+
"owner_fw_boot_str": "Bare metal PASS!",
5052
"ecdsa_key": {},
5153
"orchestrator_cfg": "@//sw/host/provisioning/orchestrator/configs/skus:emulation.hjson",
5254
},
@@ -64,6 +66,7 @@ EARLGREY_SKUS = {
6466
"ownership_libs": ["//sw/device/silicon_creator/lib/ownership:test_owner"],
6567
"rom_ext": "//sw/device/silicon_creator/rom_ext:rom_ext_dice_x509_slot_b",
6668
"owner_fw": "//sw/device/silicon_owner/bare_metal:bare_metal_slot_b",
69+
"owner_fw_boot_str": "Bare metal PASS!",
6770
"ecdsa_key": {},
6871
"orchestrator_cfg": "@//sw/host/provisioning/orchestrator/configs/skus:emulation.hjson",
6972
},

0 commit comments

Comments
 (0)