net: hifemac_mdio: use log_msg_ret() correctly, report error by dev_err()

[thirdparty/u-boot.git] / lib / fdtdec_test.c

diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index f6defe16c5a694a9af4e5e476aa550edf4ab6225..1e4d5fc8326433fbdc0f3f31da32ca8918b34871 100644 (file)
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2011 The Chromium OS Authors.
  */
 
-#include <common.h>
+#include <command.h>
 #include <fdtdec.h>
 #include <linux/libfdt.h>
 #include <malloc.h>
@@ -138,6 +138,7 @@ static int run_test(const char *aliases, const char *nodes, const char *expect)
        }
 
        printf("pass\n");
+       free(blob);
        return 0;
 }
 
@@ -155,11 +156,13 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns)
        };
        fdt32_t cells[4], *ptr = cells;
        uint32_t upper, lower;
+       fdt_size_t size;
        char name[32];
        int offset;
 
        /* store one or two address cells */
-       lower = fdt_addr_unpack(carveout.start, &upper);
+       upper = upper_32_bits(carveout.start);
+       lower = lower_32_bits(carveout.start);
 
        if (na > 1 && upper > 0)
                snprintf(name, sizeof(name), "%s@%x,%x", basename, upper,
@@ -173,7 +176,9 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns)
        *ptr++ = cpu_to_fdt32(lower);
 
        /* store one or two size cells */
-       lower = fdt_size_unpack(carveout.end - carveout.start + 1, &upper);
+       size = carveout.end - carveout.start + 1;
+       upper = upper_32_bits(size);
+       lower = lower_32_bits(size);
 
        if (ns > 1)
                *ptr++ = cpu_to_fdt32(upper);
@@ -183,8 +188,8 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns)
        offset = CHECK(fdt_add_subnode(fdt, 0, name + 1));
        CHECK(fdt_setprop(fdt, offset, "reg", cells, (na + ns) * sizeof(*cells)));
 
-       return fdtdec_set_carveout(fdt, name, "memory-region", 0,
-                                  "framebuffer", &carveout);
+       return fdtdec_set_carveout(fdt, name, "memory-region", 0, &carveout,
+                                  "framebuffer", NULL, 0, 0);
 }
 
 static int check_fdt_carveout(void *fdt, uint32_t address_cells,
@@ -208,7 +213,8 @@ static int check_fdt_carveout(void *fdt, uint32_t address_cells,
        printf("carveout: %pap-%pap na=%u ns=%u: ", &expected.start,
               &expected.end, address_cells, size_cells);
 
-       CHECK(fdtdec_get_carveout(fdt, name, "memory-region", 0, &carveout));
+       CHECK(fdtdec_get_carveout(fdt, name, "memory-region", 0, &carveout,
+                                 NULL, NULL, NULL, NULL));
 
        if ((carveout.start != expected.start) ||
            (carveout.end != expected.end)) {
@@ -288,11 +294,12 @@ static int check_carveout(void)
        CHECKVAL(make_fdt_carveout(fdt, FDT_SIZE, 2, 2), 0);
        CHECKOK(check_fdt_carveout(fdt, 2, 2));
 
+       free(fdt);
        return 0;
 }
 
-static int do_test_fdtdec(cmd_tbl_t *cmdtp, int flag, int argc,
-                         char * const argv[])
+static int do_test_fdtdec(struct cmd_tbl *cmdtp, int flag, int argc,
+                         char *const argv[])
 {
        /* basic tests */
        CHECKOK(run_test("", "", ""));