diff options
| author | LaMont Jones <lamontjones@chromium.org> | 2019-09-08 12:13:52 -0600 |
|---|---|---|
| committer | LaMont Jones <lamontjones@chromium.org> | 2019-09-08 19:40:07 +0000 |
| commit | 9d0e53cae9ed9c84fc5cd5b1fb2b11e42f7c420a (patch) | |
| tree | ac4addc67aef6d350c297276ea97ba7129ef4c54 | |
| parent | 4856877a76a90ab1851c0e24593ec67e6375a60a (diff) | |
| download | vboot-9d0e53cae9ed9c84fc5cd5b1fb2b11e42f7c420a.tar.gz | |
sign_cr50_firmware.sh: allow signing MP images.
Allow MP images to be signed. Also, the manifest file name changed.
BRANCH=none
BUG=b:74100307
TEST=manual
Change-Id: Ia6b4724ceea2b7a18a2caecea7142d1b6ebfaa13
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1791816
Reviewed-by: LaMont Jones <lamontjones@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
Tested-by: LaMont Jones <lamontjones@chromium.org>
Auto-Submit: LaMont Jones <lamontjones@chromium.org>
| -rwxr-xr-x | scripts/image_signing/sign_cr50_firmware.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/image_signing/sign_cr50_firmware.sh b/scripts/image_signing/sign_cr50_firmware.sh index c87b3124..3d1e840d 100755 --- a/scripts/image_signing/sign_cr50_firmware.sh +++ b/scripts/image_signing/sign_cr50_firmware.sh @@ -53,13 +53,9 @@ verify_cr50_manifest() { fi if (( major & 1 )); then - if (( bid_flags & MP_BID_FLAG )); then - return 0 - fi - else - if (( bid_flags & PRE_PVT_BID_FLAG )); then - return 0 - fi + return 0 + elif (( bid_flags & PRE_PVT_BID_FLAG )); then + return 0 fi die "Inconsistent manifest ${manifest_source}: major = '${major}'," \ "board_id_flags = '${bid_flags}'" @@ -338,9 +334,14 @@ sign_cr50_firmware_dir() { output="${output}/cr50.bin.prod" fi + local manifest_file="${input}/prod.json" + if [[ ! -e "$manifest_file" ]]; then + manifest_file="${input}/ec_RW-manifest-prod.json" + fi + sign_cr50_firmware \ "${key_file}" \ - "${input}/ec_RW-manifest-prod.json" \ + "${manifest_file}" \ "${input}/fuses.xml" \ "${input}" \ "${input}/prod.ro.A" \ |