summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2021-06-09 13:39:18 -0500
committerCommit Bot <commit-bot@chromium.org>2021-07-29 21:13:43 +0000
commit5ffa309012b0c343c75ddb795e67232c10901f22 (patch)
tree0659db81d697691853742c680589eae586e920d6
parent4c8ab706aa22ab97181b7f7cb570da5210e94492 (diff)
downloadchrome-ec-5ffa309012b0c343c75ddb795e67232c10901f22.tar.gz
ap_ro_integrity_check: allow setting hash in DBG images
It's difficult to erase the board id. Skip the board id check for setting the hash with a DBG image. These images are only used by developers. BUG=none TEST=ap_ro_hash.py -v True GBB with and without the board id set with a DBG image. Change-Id: I3cb56323aac5d32c3552e91db8f05724ba04fe94 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2950311 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> (cherry picked from commit b529376c7bc36d9627d0e1992fa470be76014674) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3004076 Reviewed-by: Andrey Pronin <apronin@chromium.org> Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> (cherry picked from commit e66bdeeba5ba17ac583714edb7c7324eed5afe57) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3059205
-rw-r--r--common/ap_ro_integrity_check.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/ap_ro_integrity_check.c b/common/ap_ro_integrity_check.c
index 3ec0296d9c..c1d1c22959 100644
--- a/common/ap_ro_integrity_check.c
+++ b/common/ap_ro_integrity_check.c
@@ -110,10 +110,12 @@ static enum vendor_cmd_rc vc_seed_ap_ro_check(enum vendor_cmd_cc code,
*response_size = 1; /* Just in case there is an error. */
/* Neither write nor erase are allowed once Board ID is programmed. */
+#ifndef CR50_DEV
if (!board_id_is_erased()) {
*response = ARCVE_BID_PROGRAMMED;
return VENDOR_RC_NOT_ALLOWED;
}
+#endif
if (input_size == 0) {
/* Empty payload is a request to erase the hash. */