9 files changed, 19 insertions, 86 deletions

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 331b837cec57..f1bec00d5a85 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1053,36 +1053,26 @@ void prom_free_prom_memory(void)
 int octeon_prune_device_tree(void);
 
 extern const char __dtb_octeon_3xxx_begin;
-extern const char __dtb_octeon_3xxx_end;
 extern const char __dtb_octeon_68xx_begin;
-extern const char __dtb_octeon_68xx_end;
 void __init device_tree_init(void)
 {
-        int dt_size;
-        struct boot_param_header *fdt;
+        const void *fdt;
         bool do_prune;
 
         if (octeon_bootinfo->minor_version >= 3 && octeon_bootinfo->fdt_addr) {
                 fdt = phys_to_virt(octeon_bootinfo->fdt_addr);
                 if (fdt_check_header(fdt))
                         panic("Corrupt Device Tree passed to kernel.");
-                dt_size = be32_to_cpu(fdt->totalsize);
                 do_prune = false;
         } else if (OCTEON_IS_MODEL(OCTEON_CN68XX)) {
-                fdt = (struct boot_param_header *)&__dtb_octeon_68xx_begin;
-                dt_size = &__dtb_octeon_68xx_end - &__dtb_octeon_68xx_begin;
+                fdt = &__dtb_octeon_68xx_begin;
                 do_prune = true;
         } else {
-                fdt = (struct boot_param_header *)&__dtb_octeon_3xxx_begin;
-                dt_size = &__dtb_octeon_3xxx_end - &__dtb_octeon_3xxx_begin;
+                fdt = &__dtb_octeon_3xxx_begin;
                 do_prune = true;
         }
 
-        /* Copy the default tree from init memory. */
-        initial_boot_params = early_init_dt_alloc_memory_arch(dt_size, 8);
-        if (initial_boot_params == NULL)
-                panic("Could not allocate initial_boot_params");
-        memcpy(initial_boot_params, fdt, dt_size);
+        initial_boot_params = (void *)fdt;
 
         if (do_prune) {
                 octeon_prune_device_tree();
@@ -1090,7 +1080,7 @@ void __init device_tree_init(void)
         } else {
                 pr_info("Using passed Device Tree.\n");
         }
-        unflatten_device_tree();
+        unflatten_and_copy_device_tree();
 }
 
 static int __initdata disable_octeon_edac_p;
diff --git a/arch/mips/include/asm/mips-boards/generic.h b/arch/mips/include/asm/mips-boards/generic.h
index 48616816bcbc..c904c24550f6 100644
--- a/arch/mips/include/asm/mips-boards/generic.h
+++ b/arch/mips/include/asm/mips-boards/generic.h
@@ -67,10 +67,6 @@
 
 extern int mips_revision_sconid;
 
-#ifdef CONFIG_OF
-extern struct boot_param_header __dtb_start;
-#endif
-
 #ifdef CONFIG_PCI
 extern void mips_pcibios_init(void);
 #else
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
index ccd2b75f152c..a9494c0141fb 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
@@ -21,13 +21,13 @@ extern void device_tree_init(void);
 
 struct boot_param_header;
 
-extern void __dt_setup_arch(struct boot_param_header *bph);
+extern void __dt_setup_arch(void *bph);
 
 #define dt_setup_arch(sym)                                              \
 ({                                                                      \
-        extern struct boot_param_header __dtb_##sym##_begin;            \
+        extern char __dtb_##sym##_begin[];                              \
                                                                         \
-        __dt_setup_arch(&__dtb_##sym##_begin);                          \
+        __dt_setup_arch(__dtb_##sym##_begin);                           \
 })
 
 #else /* CONFIG_OF */
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index 3c3b0df8f48d..5d39bb85bf35 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -47,7 +47,7 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
         return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
 }
 
-void __init __dt_setup_arch(struct boot_param_header *bph)
+void __init __dt_setup_arch(void *bph)
 {
         if (!early_init_dt_scan(bph))
                 return;
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index 19686c5bc5ed..7447d322d14e 100644
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -71,23 +71,12 @@ void __init plat_mem_setup(void)
          * Load the builtin devicetree. This causes the chosen node to be
          * parsed resulting in our memory appearing
          */
-        __dt_setup_arch(&__dtb_start);
+        __dt_setup_arch(__dtb_start);
 }
 
 void __init device_tree_init(void)
 {
-        unsigned long base, size;
-
-        if (!initial_boot_params)
-                return;
-
-        base = virt_to_phys((void *)initial_boot_params);
-        size = be32_to_cpu(initial_boot_params->totalsize);
-
-        /* Before we do anything, lets reserve the dt blob */
-        reserve_bootmem(base, size, BOOTMEM_DEFAULT);
-
-        unflatten_device_tree();
+        unflatten_and_copy_device_tree();
 }
 
 void __init prom_init(void)
diff --git a/arch/mips/lantiq/prom.h b/arch/mips/lantiq/prom.h
index 8e07b5f28ef1..bfd2d58c1d69 100644
--- a/arch/mips/lantiq/prom.h
+++ b/arch/mips/lantiq/prom.h
@@ -26,6 +26,4 @@ struct ltq_soc_info {
 extern void ltq_soc_detect(struct ltq_soc_info *i);
 extern void ltq_soc_init(void);
 
-extern struct boot_param_header __dtb_start;
-
 #endif
diff --git a/arch/mips/mti-sead3/sead3-setup.c b/arch/mips/mti-sead3/sead3-setup.c
index bf7fe48bf2f9..e43f4801a245 100644
--- a/arch/mips/mti-sead3/sead3-setup.c
+++ b/arch/mips/mti-sead3/sead3-setup.c
@@ -69,17 +69,17 @@ static void __init parse_memsize_param(void)
         if (!memsize)
                 return;
 
-        offset = fdt_path_offset(&__dtb_start, "/memory");
+        offset = fdt_path_offset(__dtb_start, "/memory");
         if (offset > 0) {
                 uint64_t new_value;
                 /*
                  * reg contains 2 32-bits BE values, offset and size. We just
                  * want to replace the size value without affecting the offset
                  */
-                prop_value = fdt_getprop(&__dtb_start, offset, "reg", &prop_len);
+                prop_value = fdt_getprop(__dtb_start, offset, "reg", &prop_len);
                 new_value = be64_to_cpu(*prop_value);
                 new_value =  (new_value & ~0xffffffffllu) | memsize;
-                fdt_setprop_inplace_u64(&__dtb_start, offset, "reg", new_value);
+                fdt_setprop_inplace_u64(__dtb_start, offset, "reg", new_value);
         }
 }
 
@@ -92,7 +92,7 @@ void __init plat_mem_setup(void)
          * Load the builtin devicetree. This causes the chosen node to be
          * parsed resulting in our memory appearing
          */
-        __dt_setup_arch(&__dtb_start);
+        __dt_setup_arch(__dtb_start);
 }
 
 void __init device_tree_init(void)
diff --git a/arch/mips/netlogic/xlp/dt.c b/arch/mips/netlogic/xlp/dt.c
index 5754097b9cde..bdde33147bce 100644
--- a/arch/mips/netlogic/xlp/dt.c
+++ b/arch/mips/netlogic/xlp/dt.c
@@ -42,7 +42,7 @@
 #include <asm/prom.h>
 
 extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[],
-        __dtb_xlp_fvp_begin[], __dtb_xlp_gvp_begin[], __dtb_start[];
+        __dtb_xlp_fvp_begin[], __dtb_xlp_gvp_begin[];
 static void *xlp_fdt_blob;
 
 void __init *xlp_dt_init(void *fdtp)
@@ -87,22 +87,7 @@ void __init xlp_early_init_devtree(void)
 
 void __init device_tree_init(void)
 {
-        unsigned long base, size;
-        struct boot_param_header *fdtp = xlp_fdt_blob;
-
-        if (!fdtp)
-                return;
-
-        base = virt_to_phys(fdtp);
-        size = be32_to_cpu(fdtp->totalsize);
-
-        /* Before we do anything, lets reserve the dt blob */
-        reserve_bootmem(base, size, BOOTMEM_DEFAULT);
-
-        unflatten_device_tree();
-
-        /* free the space reserved for the dt blob */
-        free_bootmem(base, size);
+        unflatten_and_copy_device_tree();
 }
 
 static struct of_device_id __initdata xlp_ids[] = {
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index eccc5526155e..251395210e23 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -28,8 +28,6 @@
 __iomem void *rt_sysc_membase;
 __iomem void *rt_memc_membase;
 
-extern struct boot_param_header __dtb_start;
-
 __iomem void *plat_of_remap_node(const char *node)
 {
         struct resource res;
@@ -52,30 +50,7 @@ __iomem void *plat_of_remap_node(const char *node)
 
 void __init device_tree_init(void)
 {
-        unsigned long base, size;
-        void *fdt_copy;
-
-        if (!initial_boot_params)
-                return;
-
-        base = virt_to_phys((void *)initial_boot_params);
-        size = be32_to_cpu(initial_boot_params->totalsize);
-
-        /* Before we do anything, lets reserve the dt blob */
-        reserve_bootmem(base, size, BOOTMEM_DEFAULT);
-
-        /* The strings in the flattened tree are referenced directly by the
-         * device tree, so copy the flattened device tree from init memory
-         * to regular memory.
-         */
-        fdt_copy = alloc_bootmem(size);
-        memcpy(fdt_copy, initial_boot_params, size);
-        initial_boot_params = fdt_copy;
-
-        unflatten_device_tree();
-
-        /* free the space reserved for the dt blob */
-        free_bootmem(base, size);
+        unflatten_and_copy_device_tree();
 }
 
 void __init plat_mem_setup(void)
@@ -86,7 +61,7 @@ void __init plat_mem_setup(void)
          * Load the builtin devicetree. This causes the chosen node to be
          * parsed resulting in our memory appearing
          */
-        __dt_setup_arch(&__dtb_start);
+        __dt_setup_arch(__dtb_start);
 
         if (soc_info.mem_size)
                 add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M,