qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: ut: fix fdt_getprop_u32() change 

fdt_getprop_u32 is not exported and it's different than what the
unit test uses. Rename u32 prop access methods to something that's
unit test specific.

Change-Id: I0256118c7ae7b6709c4ef0791c53093e3117f23e
Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 706708d3b2e7ade443836e7a14802a5a63b59713)
This commit is contained in:
Pantelis Antoniou 2017-09-04 23:12:22 +03:00 committed by Kever Yang
parent 0608812d5b
commit ea99241c37
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/overlay/cmd_ut_overlay.c
View File

@ -21,7 +21,7 @@
extern u32 __dtb_test_fdt_base_begin; extern u32 __dtb_test_fdt_base_begin;
extern u32 __dtb_test_fdt_overlay_begin; extern u32 __dtb_test_fdt_overlay_begin;
static int fdt_getprop_u32_by_index(void *fdt, const char *path, static int ut_fdt_getprop_u32_by_index(void *fdt, const char *path,
const char *name, int index, const char *name, int index,
u32 *out) u32 *out)
{ {
@ -42,10 +42,10 @@ static int fdt_getprop_u32_by_index(void *fdt, const char *path,
return 0; return 0;
} }
static int fdt_getprop_u32(void *fdt, const char *path, const char *name, static int ut_fdt_getprop_u32(void *fdt, const char *path, const char *name,
u32 *out) u32 *out)
{ {
return fdt_getprop_u32_by_index(fdt, path, name, 0, out); return ut_fdt_getprop_u32_by_index(fdt, path, name, 0, out);
} }
static int fdt_getprop_str(void *fdt, const char *path, const char *name, static int fdt_getprop_str(void *fdt, const char *path, const char *name,
@ -68,7 +68,7 @@ static int fdt_overlay_change_int_property(struct unit_test_state *uts)
void *fdt = uts->priv; void *fdt = uts->priv;
u32 val = 0; u32 val = 0;
ut_assertok(fdt_getprop_u32(fdt, "/test-node", "test-int-property", ut_assertok(ut_fdt_getprop_u32(fdt, "/test-node", "test-int-property",
&val)); &val));
ut_asserteq(43, val); ut_asserteq(43, val);
@ -158,11 +158,11 @@ static int fdt_overlay_local_phandle(struct unit_test_state *uts)
local_phandle = fdt_get_phandle(fdt, off); local_phandle = fdt_get_phandle(fdt, off);
ut_assert(local_phandle); ut_assert(local_phandle);
ut_assertok(fdt_getprop_u32_by_index(fdt, "/", "test-several-phandle", ut_assertok(ut_fdt_getprop_u32_by_index(fdt, "/", "test-several-phandle",
0, &val)); 0, &val));
ut_asserteq(local_phandle, val); ut_asserteq(local_phandle, val);
ut_assertok(fdt_getprop_u32_by_index(fdt, "/", "test-several-phandle", ut_assertok(ut_fdt_getprop_u32_by_index(fdt, "/", "test-several-phandle",
1, &val)); 1, &val));
ut_asserteq(local_phandle, val); ut_asserteq(local_phandle, val);
@ -189,11 +189,11 @@ static int fdt_overlay_local_phandles(struct unit_test_state *uts)
test_phandle = fdt_get_phandle(fdt, off); test_phandle = fdt_get_phandle(fdt, off);
ut_assert(test_phandle); ut_assert(test_phandle);
ut_assertok(fdt_getprop_u32_by_index(fdt, "/", "test-phandle", 0, ut_assertok(ut_fdt_getprop_u32_by_index(fdt, "/", "test-phandle", 0,
&val)); &val));
ut_asserteq(test_phandle, val); ut_asserteq(test_phandle, val);
ut_assertok(fdt_getprop_u32_by_index(fdt, "/", "test-phandle", 1, ut_assertok(ut_fdt_getprop_u32_by_index(fdt, "/", "test-phandle", 1,
&val)); &val));
ut_asserteq(local_phandle, val); ut_asserteq(local_phandle, val);