summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2022-04-28 12:57:11 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-05-04 23:11:41 +0000
commitb965c08f7098d8e91e347c6bfabdf92fe43a14d1 (patch)
tree832c222e3c55b33d01089fcea4027b05c1b7f45c
parent2ca4c934ce4c6b783eaea9af7c59b5cfa58578d1 (diff)
downloadchrome-ec-stabilize-14816.82.B-cr50_stab.tar.gz
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>
-rwxr-xr-xutil/bcmp.sh42
1 files changed, 29 insertions, 13 deletions
diff --git a/util/bcmp.sh b/util/bcmp.sh
index 81dede5582..a02205fe50 100755
--- a/util/bcmp.sh
+++ b/util/bcmp.sh
@@ -14,10 +14,28 @@
# different git branch. By default the other branch is
# cros/firmware-cr50-9308.B, it can be changed as a command line argument
# passed to this script.
+#
+# Usage
+# ./bcmp.sh [mp|prepvt|tot]
tmpf="/tmp/bcmp.$$"
trap '{ rm -f "${tmpf}" ; }' EXIT
-default_compare_to="cros/firmware-cr50-stab-14294.B"
+
+branch_name="${1}"
+
+if [ "${branch_name}" == "mp" ] ; then
+ compare_to_tpm2="cros/firmware-cr50-stab-mp-14300.B"
+ compare_to_cr50="${compare_to_tpm2}-cr50_stab"
+elif [ "${branch_name}" == "prepvt" ] ; then
+ compare_to_tpm2="cros/firmware-cr50-stab-14294.B"
+ compare_to_cr50="${compare_to_tpm2}-cr50_stab"
+elif [ "${branch_name}" == "tot" ] ; then
+ compare_to_tpm2="cros/main"
+ compare_to_cr50="cros/cr50_stab"
+else
+ echo "specify tot, mp, or prepvt branch"
+ exit 1
+fi
find_src_file() {
local f="$1"
@@ -68,21 +86,19 @@ fi
cr50_dir="$(pwd)"
tpm2_dir="$(readlink -f ../../third_party/tpm2/)"
-if ! branch_exists "${tpm2_dir}" "${compare_to}"; then
- echo "Branch ${compare_to} not found in ${tpm2_dir}" >&2
+if ! branch_exists "${tpm2_dir}" "${compare_to_tpm2}"; then
+ echo "Branch ${compare_to_tpm2} not found in ${tpm2_dir}" >&2
exit 1
fi
-cr50_compare_to="${compare_to}"
-if ! branch_exists "${cr50_dir}" "${cr50_compare_to}"; then
- # This could be a new branch with mangled name.
- cr50_compare_to="${cr50_compare_to}-cr50_stab"
- if ! branch_exists "${cr50_dir}" "${cr50_compare_to}"; then
- echo "Branch ${compare_to} not found in ${cr50_dir}" >&2
- exit 1
- fi
+if ! branch_exists "${cr50_dir}" "${compare_to_cr50}"; then
+ echo "Branch ${compare_to_cr50} not found in platform/cr50" >&2
+ exit 1
fi
+echo "cr50_branch: ${compare_to_cr50}"
+echo "tpm2_branch: ${compare_to_tpm2}"
+
echo "Will rebuild CR50"
if ! make BOARD=cr50 -j > /dev/null ; then
echo "building cr50 failed" >&2
@@ -108,9 +124,9 @@ done
sort "${tmpf}" | while read -r dir file; do
if [[ ${dir} == */cr50 ]]; then
- branch="${cr50_compare_to}"
+ branch="${compare_to_cr50}"
else
- branch="${compare_to}"
+ branch="${compare_to_tpm2}"
# TPM2 .o files are placed in board/cr50 in the build directory. Strip the
# prefix so that the matching .c file can be found in the TPM2 root.
file="${file#board/cr50/}"