1 files changed, 14 insertions, 8 deletions

diff --git a/arch/powerpc/boot/libfdt-wrapper.c b/arch/powerpc/boot/libfdt-wrapper.c
index c541fd8a95d4..9276327bc2bb 100644
--- a/arch/powerpc/boot/libfdt-wrapper.c
+++ b/arch/powerpc/boot/libfdt-wrapper.c
@@ -105,6 +105,11 @@ static int fdt_wrapper_setprop(const void *devp, const char *name,
         return check_err(rc);
 }
 
+static int fdt_wrapper_del_node(const void *devp)
+{
+        return fdt_del_node(fdt, devp_offset(devp));
+}
+
 static void *fdt_wrapper_get_parent(const void *devp)
 {
         return offset_devp(fdt_parent_offset(fdt, devp_offset(devp)));
@@ -165,6 +170,7 @@ static unsigned long fdt_wrapper_finalize(void)
 void fdt_init(void *blob)
 {
         int err;
+        int bufsize;
 
         dt_ops.finddevice = fdt_wrapper_finddevice;
         dt_ops.getprop = fdt_wrapper_getprop;
@@ -173,21 +179,21 @@ void fdt_init(void *blob)
         dt_ops.create_node = fdt_wrapper_create_node;
         dt_ops.find_node_by_prop_value = fdt_wrapper_find_node_by_prop_value;
         dt_ops.find_node_by_compatible = fdt_wrapper_find_node_by_compatible;
+        dt_ops.del_node = fdt_wrapper_del_node;
         dt_ops.get_path = fdt_wrapper_get_path;
         dt_ops.finalize = fdt_wrapper_finalize;
 
         /* Make sure the dt blob is the right version and so forth */
         fdt = blob;
-        err = fdt_open_into(fdt, fdt, fdt_totalsize(blob));
-        if (err == -FDT_ERR_NOSPACE) {
-                int bufsize = fdt_totalsize(fdt) + 4;
-                buf = malloc(bufsize);
-                err = fdt_open_into(fdt, buf, bufsize);
-        }
+        bufsize = fdt_totalsize(fdt) + 4;
+        buf = malloc(bufsize);
+        if(!buf)
+                fatal("malloc failed. can't relocate the device tree\n\r");
+
+        err = fdt_open_into(fdt, buf, bufsize);
 
         if (err != 0)
                 fatal("fdt_init(): %s\n\r", fdt_strerror(err));
 
-        if (buf)
-                fdt = buf;
+        fdt = buf;
 }