summaryrefslogtreecommitdiff
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* tools: drop tpm_hash_gen.pystabilize-quickfix-15183.78.B-cr50_stabstabilize-15185.B-cr50_stabstabilize-15185.7.B-cr50_stabstabilize-15183.82.B-cr50_stabstabilize-15183.69.B-cr50_stabstabilize-15183.14.B-cr50_stabstabilize-15174.B-cr50_stabstabilize-15167.B-cr50_stabrelease-R108-15183.B-cr50_stabfirmware-corsola-15194.B-cr50_stabVadim Bendebury2022-10-051-114/+0
| | | | | | | | | | | | | The script has been reworked to support multiple versions of GSC and has been moved into the Ti50 tree. BUG=None TEST=None Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Change-Id: I4ff086b73796bad09a7b572aa68566470582c28b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3936350 Reviewed-by: Mary Ruthven <mruthven@chromium.org>
* prepare to release 0.{5,6}.130firmware-duplo-15151.B-cr50_stabMary Ruthven2022-09-282-2/+2
| | | | | | | | | | | BUG=b:243160187 TEST=none Change-Id: Ib3fa73f9344f4342777a4f100bd28ee874f422dc Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3922444 Reviewed-by: Andrey Pronin <apronin@chromium.org> Commit-Queue: Andrey Pronin <apronin@chromium.org>
* fix ChromiumOS authors and whitespace warningsMary Ruthven2022-09-1326-27/+26
| | | | | | | | | | | BUG=none TEST=none Change-Id: I61b0b0106a43f723ec3bc805eb190aef00bbd05b Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3894391 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* util: convert config_option_check.py to Python 3Jack Rosenthal2022-08-261-18/+28
| | | | | | | | | | | | | | | | | | | | | | | The main fixes that were needed were: * Use utf-8 encoding from git subprocess. * Don't use 'is' to compare string equality (Python does not guarantee interning of strings). For the parser state, the string comparison was removed by changing this to an Enum, since we have Python 3 anyway. BUG=chromium:1031705 TEST=create commit with invalid config options and run script, notice the script points them out and exits 1, then test without that commit, no output and exit 0. Change-Id: I1113e063f747f0207c4b59a74f4e4a06bbcd5fcd Signed-off-by: Jack Rosenthal <jrosenth@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2068520 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> (cherry picked from commit a9666e310606cbd1a54d32fa0cb200f16cf1d451) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3858397 Tested-by: Mary Ruthven <mruthven@chromium.org> Auto-Submit: Mary Ruthven <mruthven@chromium.org>
* util/flash_cr50: Update servo controlsstabilize-15033.B-cr50_stabstabilize-15032.B-cr50_stabRobert Zieba2022-08-051-9/+9
| | | | | | | | | | | | | | | | This utility currently uses the outdated servo controls `servo_v4_type` and `servo_v4_role`. These were replaced with `root.dut_connection_type` and `servo_pd_role` respectively. This commit updates this utility to use the updated controls BUG=none TEST=Flash Cr50 FW on a DeWatt device Signed-off-by: Robert Zieba <robertzieba@google.com> Change-Id: Ic24215725a09ce464c39fa1ffc8c2b3965a9738f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3811889 Reviewed-by: Mary Ruthven <mruthven@chromium.org> Commit-Queue: Mary Ruthven <mruthven@chromium.org>
* prepare to release 0.{5,6}.120stabilize-quickfix-14909.132.B-cr50_stabstabilize-14909.100.B-cr50_stabrelease-R104-14909.B-cr50_stabfirmware-guybrush-14500.B-cr50_stabfactory-guybrush-14908.B-cr50_stabfactory-brya-14909.124.B-cr50_stabMary Ruthven2022-06-062-2/+2
| | | | | | | | | | | BUG=b:235079109 TEST=none Change-Id: Ia0892309b9586737b518d9b037b083e0b3231b34 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3691319 Commit-Queue: Vadim Bendebury <vbendeb@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* ap_ro_hash: use dump_fmap flashrom formatMary Ruthven2022-05-191-12/+10
| | | | | | | | | | | | | Use the dump_fmap flashrom output to calculate the offset and size. All of the information is included on one line. BUG=none TEST=ap_ro_hash.py -v GBB True Change-Id: I160173caaaf540c20786e892d244ee8a941833b6 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3654254 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* ap_ro_hash: break up ranges into 4M blocksMary Ruthven2022-05-191-6/+19
| | | | | | | | | | | | | If a range is too big, break it up into smaller blocks that GSC can handle. BUG=none TEST=run `ap_ro_hash.py COREBOOT` on volteer. Change-Id: I094c2eb725af07e21b3e249336cb7b556761b50c Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3644691 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* bcmp: use mp, tot, or prepvt as the branch inputstabilize-14839.B-cr50_stabstabilize-14816.84.B-cr50_stabstabilize-14816.82.B-cr50_stabstabilize-14816.138.B-cr50_stabstabilize-14816.131.B-cr50_stabstabilize-14803.B-cr50_stabstabilize-14790.B-cr50_stabrelease-R103-14816.B-cr50_stabfactory-firmware-ti50-guc-14778.B-cr50_stabfactory-14778.B-cr50_stabMary Ruthven2022-05-041-13/+29
| | | | | | | | | | | | | | | Use mp, prepvt, and tot as the bcmp input. Convert those to the correct tpm2 and cr50 branch names. BUG=none TEST=./util/bcmp.sh mp ; ./util/bcmp.sh tot ; ./util/bcmp.sh prepvt ; verify the tpm2 and cr50 branch names are correct. Change-Id: I0d1c237fd4322a102b939a7c16f10f991bf408fb Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3615476 Commit-Queue: Vadim Bendebury <vbendeb@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* prepare to release 0.{5,6}.111Mary Ruthven2022-05-042-2/+2
| | | | | | | | | | BUG=b:229877169 TEST=none Change-Id: I9b1e04f5487662816401129adb593b7f1c0e259b Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3628135 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* ap_ro_hash: print calculated digestMary Ruthven2022-05-041-0/+1
| | | | | | | | | | | | | Print the calculated digest, so we can use it for debugging. BUG=none TEST=./ap_ro_hash.py -v True GBB prints a digest that matches the digest from the trunks_send command and the one saved in cr50. Change-Id: I686dac5248782ea68d7bab98c2554940cc0b74b3 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3624499 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* prepare to release 0.{5,6}.110Mary Ruthven2022-04-272-2/+2
| | | | | | | | | | | BUG=b:229877169 TEST=none Change-Id: I492616346f21b824915fba33c66ad296507bcaf7 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3611617 Commit-Queue: Vadim Bendebury <vbendeb@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* tpm_hash_gen.py: extend to cover larger range of git tagsVadim Bendebury2022-04-141-1/+1
| | | | | | | | | | | | | | Let's allow wider major version range, expanding it from 0..2 to 0..4. BUG=b:183016758 TEST=successfully generated hashes for cr50_v3... images. Change-Id: I8f9e8119b4a31753932065234505cd5d22df91a4 Signed-off-by: Vadim Bendebury <vbendeb@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3582971 Reviewed-by: Mary Ruthven <mruthven@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org> Tested-by: Vadim Bendebury <vbendeb@chromium.org>
* brescue.sh: account for HW cryptolib header in the imagestabilize-quickfix-14695.187.B-cr50_stabstabilize-quickfix-14695.124.B-cr50_stabstabilize-14695.85.B-cr50_stabstabilize-14695.107.B-cr50_stabrelease-R102-14695.B-cr50_stabVadim Bendebury2022-04-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | Adding the encrypted cryptolib header to the RO created another match for the header magic pattern of 'fd ff ff ff'. One of the distinct properties of the fake header is filling up the signature field with 0x53 bytes, let's use this to filter out the fake header when looking for the RW. BUG=b:217564005,b:228839885 TEST=successfully processed Ti50 image with HW cryptolib included. Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Change-Id: I83e4f7ad90ba1030ec4134db00485f10dc2fcdee Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3561025 Reviewed-by: Andrew Luo <aluo@chromium.org> Reviewed-by: Edward Hill <ecgh@chromium.org> Commit-Queue: Edward Hill <ecgh@chromium.org> Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org> Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
* prepare to release 0.{5,6}.100Mary Ruthven2022-03-012-2/+2
| | | | | | | | | | | BUG=b:222132584 TEST=none Change-Id: I2a231373f992fdb21ae6eeb440e2e7243adbe481 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3498710 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
* flash_cr50: add support for using pch_disable to reset cr50Mary Ruthven2022-02-151-10/+25
| | | | | | | | | | | | | | | | Boards like zork can reset cr50 with pch_disable, but don't have the cr50_reset_odl overlay in their hdctools overlay. Add support for trying to use that control to reset cr50. Allow people to use that signal if they want. Worst case is it won't reset cr50. BUG=none TEST=./util/flash_cr50.py -i $IMG -p 9999 -c cr50-rescue -r pch_disable Change-Id: I0843fc6d93bedaa32f491389badc7f1836e3402d Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3465528 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
* prepare to release 0.{5,6}.93factory-brya-14517.B-cr50_stabMary Ruthven2022-02-122-2/+2
| | | | | | | | | | | BUG=b:207143125 TEST=make buildall -j Change-Id: I329192d5b4d383d72b90bc90c46589b156f5391b Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3456709 Reviewed-by: Andrey Pronin <apronin@chromium.org> Commit-Queue: Andrey Pronin <apronin@chromium.org>
* cr50: update FIPS module based on operational testing findingsstabilize-14498.B-cr50_stabstabilize-14496.B-cr50_stabfirmware-brya-14505.B-cr50_stabfirmware-brya-14505.71.B-cr50_stabVadim Sukhomlinov2022-01-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. ECDSA pair-wise consistency test failure wasn't updating FIPS status. Added new failure bit FIPS_FATAL_ECDSA_PWCT. 2. ECDSA KAT was only simulating error in verify, but not in sign. Split 'fips ecdsa' into 'fips ecver' and 'fips ecsign'. 3. Added a way to introduce self-integrity error by not updating FIPS module digest with 'FIPS_BREAK=1' during build. 4. Added reporting of FIPS module digest. BUG=b:134594373 TEST=make CRYPTO_TEST=1; in ccd test: fips pwct; tpm_test.py should fail; fips should print error. - fips ecver; fips test reports ECDSA error fips ecsign; fips test reports ECDSA error - FIPS module digest is printed - FIPS_BREAK=1 make CRYPTO_TEST=1 produce build with zero digest reporint FIPS self-integrity error. Signed-off-by: Vadim Sukhomlinov <sukhomlinov@google.com> Change-Id: Ib0a92c118f07a76e4b52eaf9b011ff4f73a02c61 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3425998 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Reviewed-by: Mary Ruthven <mruthven@chromium.org> Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
* prepare to release 0.{5,6}.92Mary Ruthven2022-01-262-2/+2
| | | | | | | | | | | BUG=b:207143125 TEST=make buildall -j Change-Id: Ide0ac9a563e4a1dbbf2ae209f5807e82db2e20c5 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3415374 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* Add rescue path and early options for brescue.shAndrew Luo2022-01-141-4/+17
| | | | | | | | | | | | | | BUG=b:214266426 TEST=RESCUE=../cr50-utils/software/tools/SPI/rescue EARLY=1 \ TEST= util/brescue.sh ti50.bin /dev/ttyUSB5 TEST=util/brescue.sh ti50.bin /dev/ttyUSB5 Change-Id: I427b9c16896ddf9f12cf78f185e7718e23786648 Signed-off-by: Andrew Luo <aluo@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3388229 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Andrew Luo <aluo@chromium.org> Tested-by: Andrew Luo <aluo@chromium.org>
* prepare to release 0.{5,6}.91firmware-cherry-14454.B-cr50_stabMary Ruthven2022-01-112-2/+2
| | | | | | | | | | | BUG=b:207143125 TEST=make buildall -j Change-Id: I37e1ce5ca998c08d328a663ac18050755400a0eb Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3381053 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
* prepare to release 0.{5,6}.90stabilize-14442.B-cr50_stabMary Ruthven2022-01-052-2/+2
| | | | | | | | | | | BUG=b:207143125 TEST=make buildall -j Change-Id: I926e6ec710dc63ad1f5ec25637e1792f0363b736 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3366873 Reviewed-by: Andrey Pronin <apronin@chromium.org> Commit-Queue: Andrey Pronin <apronin@chromium.org>
* util: scripts and instructions for using GSC without servodVadim Bendebury2021-12-222-0/+150
| | | | | | | | | | | | | | The markdown document describes the use of the scripts and provides instructions on connecting to GSC and controlling it using Servo Micro or C2D2 with very low overhead. BUG=none TEST=verified instructions by running the commands successfully. Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Change-Id: I268ffa364d4230d72dcd529c1102cb422b980e1e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3352888 Reviewed-by: Andrey Pronin <apronin@chromium.org>
* bcmp.sh: script for comparing Cr50 code branchesVadim Bendebury2021-12-221-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script builds a Cr50 image from scratch, then by examining the contents of builed/cr50/RW the script figures out the source files which were used to build the image and then compares all source files with a different git branch. The branch to compare with by default is cros/firmware-cr50-stab-14294.B, if the user wants to compare to a different branch, the name of the branch can be passed as command line parameter. The Cr50 tree branch names in firmware branches are modified by addition of the '-cr50_stab' suffix, the script tries adding the suffix if the branch to compare to does not exist in the Cr50 tree. Two git trees are examined, Cr50 and tpm2. If the other branch does not exist in either of the trees or building Cr50 image fails, the script reports error and exits. The result of running the script is a set of git diffs for files which are different between branches. BUG=b:200823466 TEST=ran the script to compare ToT and pre-pvt Cr50 branches, observed sensible results. Signed-off-by: Vadim Bendebury <vbendeb@google.com> Change-Id: Ic044c2d23758eed1a5573385e903e59ed4328635 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3297446 Tested-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-by: Mary Ruthven <mruthven@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* prepare to release 0.{5,6}.73Mary Ruthven2021-12-212-2/+2
| | | | | | | | | | | BUG=b:207143125 TEST=make buildall -j Change-Id: I3ddfcb55cfe7fcf941a23575d167ad8bd1ccedc0 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3352184 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* prepare to release 0.{5,6}.72Mary Ruthven2021-12-162-2/+2
| | | | | | | | | | | BUG=b:207143125 TEST=make buildall -j Change-Id: I5f6e29b470afd087aef7c9e11720f87f3663999c Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3345283 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* prepare to release 0.{5,6}.71Mary Ruthven2021-12-132-2/+2
| | | | | | | | | | | BUG=b:207143125 TEST=make buildall -j Change-Id: I1fd5721c8f06d04322668ab0fb73c7375521727a Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3336198 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* getversion: drop cryptoc from the Cr50 version stringstabilize-14396.B-cr50_stabstabilize-14395.B-cr50_stabstabilize-14388.62.B-cr50_stabstabilize-14388.61.B-cr50_stabstabilize-14388.52.B-cr50_stabrelease-R98-14388.B-cr50_stabVadim Bendebury2021-12-071-1/+1
| | | | | | | | | | | | | | | | Cr50 uses local implementation of crypto, no need to keep track of the third_party tree. BUG=None TEST=built cr50 image and ran it, verified that cryptoc is not included in the version string any more. Signed-off-by: Vadim Bendebury <vbendeb@google.com> Change-Id: Ic016492ffc203a704d9ad252a4a05cc16074863f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3318734 Tested-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-by: Mary Ruthven <mruthven@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* prepare to release 0.{5,6}.70Mary Ruthven2021-11-192-2/+2
| | | | | | | | | | | BUG=b:207143125 TEST=make buildall -j Change-Id: Ib31feddde38061df787ec78b7a2131f00b4cc634 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3291134 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
* coil: replace non-inclusive terms with "validity"Mary Ruthven2021-11-191-1/+1
| | | | | | | | | | BUG=b:173227629 TEST=make buildall -j Change-Id: Iaf8028984cc58cc4108907fdba4ea4b38c43cf70 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3293250 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
* cr50: prepare to release 0.{5,6}.60Mary Ruthven2021-10-152-2/+2
| | | | | | | | | | BUG=b:203205487 TEST=none Change-Id: I90ef2a52a40ceef6de930df2acb635cdc0b3d014 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3227259 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* fips: silence fips section fillerVadim Bendebury2021-10-111-7/+13
| | | | | | | | | | | | | | | | | | | | | | Script inserting FIPS checksum into the image uses the dd utility which generates stderr output even when there is no errors. This patch adds code which captures the dd stderr output and prints it out only if there is an actual error. stdout output of the script is suppressed unless make was invoked with V=1. Also made a few modifications as requested by shellcheck. BUG=none TEST=make output does not have extra lines. built and ran a Cr50 image, it reports successful FIPS integrity self check. Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Change-Id: I9121bc5a9a40633b9a3d18ea5766bc1ed274a9c2 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3210946 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
* Excise cros_logging modulestabilize-rust-14224.B-cr50_stabChris McDonald2021-09-161-1/+1
| | | | | | | | | | | | | | | Replace all usages of chromite.lib.cros_logging with the stdlib logging module. BUG=b:191490453 TEST=None BRANCH=None Signed-off-by: Chris McDonald <cjmcdonald@chromium.org> Change-Id: I661a620fb514b2b53b6e6c5d76c90cca0280959c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3162336 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Reviewed-by: Alex Klein <saklein@chromium.org>
* add script to inject the fips fingerprintMary Ruthven2021-09-071-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inject the fips fingerprint into the cr50 image, so it can verify the fips module before starting to execute it. This change adds a script to calculate the checksum and inject it into a elf file before signing. If CONFIG_FIPS_CHECKSUM is defined, generate an elf file with the fips checksum and use that to create signed images and hex files. The build process doesn't change for RO artifacts. Nothing changes if CONFIG_FIPS_CHECKSUM isn't defined. The new chain for RW is ec.RW.elf -> ec.RW.elf.fips -> ec.RW.flat ec.RW.elf.fips is generated with util/inject_fips_fingerprint.sh. util/inject_fips_fingerprint.sh calculates the fips module fingerprint, copies ec.RW.elf to ec.RW.elf.fips, and then injects the fingerprint into ec.RW.elf.fips. util/signer/bs will be modified to use ec.RW.elf.fips if it exists in a followup CL. BUG=none TEST=manual # Verify cr50 is the only board that creates the fips artifacts make buildall -j objdump the text.fips_checksum section of ec.RW.elf and ec.RW_B.elf. Make sure they match ec.RW.fips.checksum and ec.RW_B.fips.checksum # Verify cr50 can update to image signed with devid and that # image shows Stored hash that matches the computed one. H1_DEVIDS="${DEVID}" make -j BOARD=cr50 CR50_DEV=1 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Change-Id: Iab857ec1b7e3ae0d23681a25467e26286bd68210 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3078053 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* cr50: prepare to release 0.{5,6}.51Mary Ruthven2021-08-242-2/+2
| | | | | | | | | | | BUG=b:194901448 TEST=none Change-Id: Ia16d194f042ab44a36e00668f699dfab4df8a536 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3114224 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* cr50: prod: use 6 as the major versionMary Ruthven2021-08-241-1/+1
| | | | | | | | | | | | | | | | Use 6 as the major version in util/signer/ec_RW-manifest-prod.json to reduce merge conflicts in the branches This has no real effect since we don't prod sign TOT images. BUG=none TEST=none Change-Id: I1300a4080ea4a5fee3115f1e32736985789d9c11 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3114223 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* cr50: prepare to release 0.{5,6}.50Mary Ruthven2021-08-052-2/+2
| | | | | | | | | | BUG=b:194901448 TEST=none Change-Id: I9d4d5133d26ac528b2ecf5e1b0f4be20a47badb8 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3072819 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* cr50: prepare to release 0.{5,6}.40Mary Ruthven2021-07-022-2/+2
| | | | | | | | | | | BUG=b:192269002 TEST=none Change-Id: Ied092d9dd0a909aae116f440fa545ee43ec4c6ed Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3002844 Reviewed-by: Andrey Pronin <apronin@chromium.org> Commit-Queue: Andrey Pronin <apronin@chromium.org>
* test: port to Python3Vadim Bendebury2021-06-181-2/+4
| | | | | | | | | | | | | | Porting consisted of running 2to3 and then modifying the Tee::write() function by hand. BUG=none TEST='make -j buildall' does not throw Python2 warnings any more and still succeeds. Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Change-Id: I6762bfc176ef749dccba7572db171dd2f83aaebc Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2973575 Reviewed-by: Namyoon Woo <namyoon@chromium.org>
* flash_cr50: add support to reboot with the consolestabilize-14026.B-cr50_stabMary Ruthven2021-06-091-4/+33
| | | | | | | | | | | | | | If cr50 is open, flash_cr50 can just run 'reboot' on the cr50 console to reboot cr50. Add support for doing that. BUG=none TEST=flash_cr50.py -p 9999 -i $IMG -c cr50-rescue -r console_reboot Change-Id: Ibe0d7f98c64faf7f0ac35b04dfad89ad58333cac Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2945957 Reviewed-by: Namyoon Woo <namyoon@chromium.org> Commit-Queue: Namyoon Woo <namyoon@chromium.org>
* flash_cr50: wait up to 15 seconds for EC cutoffMary Ruthven2021-05-211-2/+9
| | | | | | | | | | BUG=b:188846962 TEST=run on hatch Change-Id: I1d9ea6048cec240c830dcd5d56c41b5cbfd622a1 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2911495 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
* cr50: prepare to release 0.{5,6}.30Mary Ruthven2021-05-142-2/+2
| | | | | | | | | | | BUG=b:187083680 TEST=none Change-Id: I76ad8b29b32007fde0e8a6b527f08fa2333e801a Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2897918 Reviewed-by: Namyoon Woo <namyoon@chromium.org> Commit-Queue: Namyoon Woo <namyoon@chromium.org>
* signer: advance version and erase new bit in rollback mapMary Ruthven2021-05-042-4/+4
| | | | | | | | | | | | | | | | | | | BUG=b:187081660 TEST=flashing the image erases the third rollback mask bit [0.049072 update_rollback_mask: bailing out at bit 0] [0.051795 update_rollback_mask: bailing out at bit 3] [0.052886 updated 1 info map words] > sysinfo ... Rollback: 0/0/1 3/3/3 ... Change-Id: Id802e3e4b010fbc7274e34360beaa47adcd0816f Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2869128 Reviewed-by: Andrey Pronin <apronin@chromium.org>
* cr50: prepare to release 0.{5,6}.10Mary Ruthven2021-04-192-2/+2
| | | | | | | | | | | BUG=none TEST=none Change-Id: I73cca2c2e9044f9dd8b7cb9a4d558ad9c6ec83b1 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2837405 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* flash_cr50: add c2d2 to allowable servo typesstabilize-rust-13795.B-cr50_stabstabilize-13799.B-cr50_stabMary Ruthven2021-02-091-1/+1
| | | | | | | | | | BUG=none TEST=run flash_cr50 with c2d2 and servo_micro Change-Id: Idba1a344fb615347ccbdca6cad3956b05be2326b Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2648393 Reviewed-by: Venkata Srinivasa Raju Penmetcha <venkataraju@chromium.org>
* cr50: prepare to release 0.{5,6}.9stabilize-rust-13776.B-cr50_stabstabilize-13768.B-cr50_stabMary Ruthven2021-02-022-2/+2
| | | | | | | | | | | BUG=b:179153941 TEST=none Change-Id: I6b35f52d94ffeb49d947abbb71eb1445e4a96e7b Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2669267 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
* coil: config_option_check master->mainMary Ruthven2021-01-061-6/+6
| | | | | | | | | | BUG=b:175244613 TEST=make buildall -j Change-Id: I8a5273dca838d922627d084ee6330f5be3dfa0b7 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2613454 Reviewed-by: Namyoon Woo <namyoon@chromium.org>
* coil: Replace "whitelist"Mary Ruthven2020-12-221-3/+3
| | | | | | | | | | | | Replace "whitelist" with "allowlist". BUG=b:175244613 TEST=make buildall -j Change-Id: Ie0a23cb33722fe27b76d97c2ebdd548c2ecc2aa6 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2600299 Reviewed-by: Namyoon Woo <namyoon@chromium.org>
* cr50: prepare to release 0.{5,6}.8Mary Ruthven2020-10-302-2/+2
| | | | | | | | | | BUG=b:172066114 TEST=none Change-Id: I553a06c52da3468358357fa08596e01238ed86b3 Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2510463 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
* cr50: prepare to release 0.{5,6}.7Mary Ruthven2020-09-172-2/+2
| | | | | | | | | | BUG=b:168502792 TEST=none Change-Id: I4151120813f37c2427747ade01fb8a43dae9518a Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2416951 Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>