diff options
| author | Simon Glass | 2014-07-23 06:54:57 -0600 |
|---|---|---|
| committer | Simon Glass | 2014-07-23 14:07:23 +0100 |
| commit | eb9ef5fee7243d43d6fa29652c8ffa987f71b834 (patch) | |
| tree | 153ed02c5915a1b1da4c86e3255a72f5781fd8ba /test | |
| parent | 5b9765c7d689166899918d49e4884e9b8c51a8ae (diff) | |
dm: Use an explicit expect value in core tests
Rather than reusing the 'reg' property, use an explicit property for the
expected ping value used in testing.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/dm/test-fdt.c | 13 | ||||
| -rw-r--r-- | test/dm/test.dts | 5 |
2 files changed, 12 insertions, 6 deletions
diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 98e3936527e..0f505373a3b 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -39,7 +39,8 @@ static int testfdt_ofdata_to_platdata(struct udevice *dev) pdata->ping_add = fdtdec_get_int(gd->fdt_blob, dev->of_offset, "ping-add", -1); - pdata->base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg"); + pdata->base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, + "ping-expect"); return 0; } @@ -127,11 +128,13 @@ static int dm_test_fdt(struct dm_test_state *dms) ut_assert(!ret); /* - * Get the 'reg' property, which tells us what the ping add - * should be. We don't use the platdata because we want - * to test the code that sets that up (testfdt_drv_probe()). + * Get the 'ping-expect' property, which tells us what the + * ping add should be. We don't use the platdata because we + * want to test the code that sets that up + * (testfdt_drv_probe()). */ - base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg"); + base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, + "ping-expect"); debug("dev=%d, base=%d: %s\n", i, base, fdt_get_name(gd->fdt_blob, dev->of_offset, NULL)); diff --git a/test/dm/test.dts b/test/dm/test.dts index ec5364f7c7e..74d236b495b 100644 --- a/test/dm/test.dts +++ b/test/dm/test.dts @@ -9,6 +9,7 @@ a-test { reg = <0>; compatible = "denx,u-boot-fdt-test"; + ping-expect = <0>; ping-add = <0>; }; @@ -24,13 +25,14 @@ b-test { reg = <3>; compatible = "denx,u-boot-fdt-test"; + ping-expect = <3>; ping-add = <3>; }; some-bus { #address-cells = <1>; #size-cells = <0>; - reg = <4>; + ping-expect = <4>; ping-add = <4>; c-test { compatible = "denx,u-boot-fdt-test"; @@ -41,6 +43,7 @@ d-test { reg = <6>; + ping-expect = <6>; ping-add = <6>; compatible = "google,another-fdt-test"; }; |