diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-15 11:15:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-15 11:15:36 +0000 |
| commit | 12dc18e4c43a20119fd6313931b5c7e319327a50 (patch) | |
| tree | a39fe51a14f9ee0f2ab5be69528a409b37c1a975 | |
| parent | 0a14873b3df2d07fab72ffe31f01f21051a3df67 (diff) | |
| parent | f8d3af72aab9ab4f1278ba6ffc0688dea746ae65 (diff) | |
| download | libufdt-12dc18e4c43a20119fd6313931b5c7e319327a50.tar.gz | |
Merge "verifyDTBO: update to use bootconfig" am: f8d3af72aatemp_273316506_tm-qpr2
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2388574
Change-Id: I7cab2e229c9cfc83981c5eee8dde7272d8923f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | tests/verifyDTBO.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/verifyDTBO.sh b/tests/verifyDTBO.sh index 4c4a732..7c3dbfd 100755 --- a/tests/verifyDTBO.sh +++ b/tests/verifyDTBO.sh @@ -27,8 +27,12 @@ adb pull /sys/firmware/fdt final_dt > /dev/null mkdtimg_path="${ANDROID_HOST_BIN_LOCATION}/mkdtboimg" $mkdtimg_path dump dtbo.img -b dumped_dtbo > /dev/null -#Get the index of the overlay applied from the kernel command line -overlay_idx=$(adb shell cat /proc/cmdline | grep -o "androidboot.dtbo_idx=[^ ]*" | cut -d "=" -f 2) +#Get the index of the overlay applied. Try bootconfig first, then cmdline. +overlay_idx=$(adb shell cat /proc/bootconfig \ + | grep 'androidboot.dtbo_idx = .*$' | cut -d "=" -f 2 | sed 's/[ \\\"]//g') +if [[ ! $overlay_idx =~ [0-9]+ ]]; then + overlay_idx=$(adb shell cat /proc/cmdline | grep -o "androidboot.dtbo_idx=[^ ]*" | cut -d "=" -f 2) +fi arg="" for idx in ${overlay_idx//,/ } do |