Skip to content

Commit

Permalink
[manuf] check owner FW boot message after perso
Browse files Browse the repository at this point in the history
This updates the FT provisioning flow to check the owner firmware boots
successfully after perso runs.

Signed-off-by: Tim Trippel <[email protected]>
  • Loading branch information
timothytrippel committed Dec 19, 2024
1 parent 5c91217 commit e753492
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
17 changes: 11 additions & 6 deletions sw/device/silicon_creator/manuf/base/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -346,10 +346,11 @@ manifest(d = {
]

_FT_PROVISIONING_CMD_ARGS = """
--elf={sram_ft_individualize}
--bootstrap={ft_personalize}
--second-bootstrap={bundle}
--ca-config={ca_config}
--elf={{sram_ft_individualize}}
--bootstrap={{ft_personalize}}
--second-bootstrap={{bundle}}
--ca-config={{ca_config}}
--owner-success-text="{owner_fw_boot_str}"
""" + FT_PROVISIONING_INPUTS

_FT_PROVISIONING_HARNESS = "//sw/host/provisioning/ft:ft_{}"
Expand Down Expand Up @@ -424,7 +425,9 @@ filegroup(
"lc_test_locked0",
"manuf",
] + (["manual"] if config.get("offline", False) else []),
test_cmd = _FT_PROVISIONING_CMD_ARGS,
test_cmd = _FT_PROVISIONING_CMD_ARGS.format(
owner_fw_boot_str = config.get("owner_fw_boot_str", ""),
),
test_harness = _FT_PROVISIONING_HARNESS.format(sku),
),
silicon = silicon_params(
Expand All @@ -447,7 +450,9 @@ filegroup(
owner_slot_b = OWNER_SLOTS["b"],
rom_ext_slot_a = SLOTS["a"],
rom_ext_slot_b = SLOTS["b"],
test_cmd = _FT_PROVISIONING_CMD_ARGS,
test_cmd = _FT_PROVISIONING_CMD_ARGS.format(
owner_fw_boot_str = config.get("owner_fw_boot_str", ""),
),
test_harness = _FT_PROVISIONING_HARNESS.format(sku),
),
)
Expand Down
3 changes: 3 additions & 0 deletions sw/device/silicon_creator/manuf/base/provisioning_inputs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ EARLGREY_SKUS = {
"ownership_libs": ["//sw/device/silicon_creator/lib/ownership:test_owner"],
"rom_ext": "//sw/device/silicon_creator/rom_ext:rom_ext_dice_x509_slot_b",
"owner_fw": "//sw/device/silicon_owner/bare_metal:bare_metal_slot_b",
"owner_fw_boot_str": "Bare metal PASS!",
"ecdsa_key": {},
"orchestrator_cfg": "@//sw/host/provisioning/orchestrator/configs/skus:emulation.hjson",
},
Expand All @@ -47,6 +48,7 @@ EARLGREY_SKUS = {
"ownership_libs": ["//sw/device/silicon_creator/lib/ownership:test_owner"],
"rom_ext": "//sw/device/silicon_creator/rom_ext:rom_ext_dice_cwt_slot_b",
"owner_fw": "//sw/device/silicon_owner/bare_metal:bare_metal_slot_b",
"owner_fw_boot_str": "Bare metal PASS!",
"ecdsa_key": {},
"orchestrator_cfg": "@//sw/host/provisioning/orchestrator/configs/skus:emulation.hjson",
},
Expand All @@ -64,6 +66,7 @@ EARLGREY_SKUS = {
"ownership_libs": ["//sw/device/silicon_creator/lib/ownership:test_owner"],
"rom_ext": "//sw/device/silicon_creator/rom_ext:rom_ext_dice_x509_slot_b",
"owner_fw": "//sw/device/silicon_owner/bare_metal:bare_metal_slot_b",
"owner_fw_boot_str": "Bare metal PASS!",
"ecdsa_key": {},
"orchestrator_cfg": "@//sw/host/provisioning/orchestrator/configs/skus:emulation.hjson",
},
Expand Down

0 comments on commit e753492

Please sign in to comment.