diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-15 11:48:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-15 11:48:13 +0000 |
commit | 60e32fb1cf8dd3629211b7d8806a954a800e6fa9 (patch) | |
tree | a39fe51a14f9ee0f2ab5be69528a409b37c1a975 | |
parent | b01c76e33442bc68c050e1d43824e818a5094f7a (diff) | |
parent | 12dc18e4c43a20119fd6313931b5c7e319327a50 (diff) | |
download | libufdt-60e32fb1cf8dd3629211b7d8806a954a800e6fa9.tar.gz |
Merge "verifyDTBO: update to use bootconfig" am: f8d3af72aa am: 12dc18e4c4
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2388574
Change-Id: Icdcc9b232ea3b5e36a19646e2e2081fdeb89fd0c
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 |