From 718007765a13fdeabae3c9286877ef6455a0940c Mon Sep 17 00:00:00 2001 From: "Kyeongkab.Nam" Date: Wed, 30 Nov 2022 04:33:32 +0900 Subject: Fix a test to check duplicated phandles All the dtbo will be merged into one fdt to verify if dtb in a test device is the same as expected. However, there are cases the number of phandle will be duplicated Fix a test to get correct phandle_offset. Bug: 259891464 Test: run vts -m VtsFirmwareDtboVerification Change-Id: Ia90a4537a4be0dfbb0316d2b47fb12d619fa7c34 (cherry picked from commit 7bcbff31c5af60933701281d5e682e62732143d8) --- tests/libufdt_verify/ufdt_test_overlay.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/libufdt_verify/ufdt_test_overlay.cpp b/tests/libufdt_verify/ufdt_test_overlay.cpp index 2554d9d..ce105fb 100644 --- a/tests/libufdt_verify/ufdt_test_overlay.cpp +++ b/tests/libufdt_verify/ufdt_test_overlay.cpp @@ -348,7 +348,7 @@ int ufdt_resolve_duplicate_phandles(ufdt** overlay_tree, size_t overlay_count) { if (ufdt_overlay_do_local_fixups(overlay_tree[i], phandle_offset) < 0) { return -1; } - phandle_offset = ufdt_get_max_phandle(overlay_tree[i]); + phandle_offset += ufdt_get_max_phandle(overlay_tree[i]); } return 0; -- cgit v1.2.3