Merge commit 'wd/master'

[platform/kernel/u-boot.git] / board / cm5200 / cm5200.c

diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c
index b74ac08..4a86d3c 100644 (file)
--- a/board/cm5200/cm5200.c
+++ b/board/cm5200/cm5200.c
@@ -276,7 +276,7 @@ static void ft_blob_update(void *blob, bd_t *bd)
        memory_data[0] = cpu_to_be32(bd->bi_memstart);
        memory_data[1] = cpu_to_be32(bd->bi_memsize);
 
-       nodeoffset = fdt_find_node_by_path (blob, "/memory");
+       nodeoffset = fdt_path_offset (blob, "/memory");
        if (nodeoffset >= 0) {
                ret = fdt_setprop(blob, nodeoffset, "reg", memory_data,
                                        sizeof(memory_data));
@@ -397,6 +397,7 @@ int misc_init_r(void)
                                        "operational\n");
 
        /* set the hostname appropriate to the module we're running on */
+       hostname[0] = 0x00;
        compose_hostname(hw_id, hostname);
        setenv("hostname", hostname);