Skip to content

Commit

Permalink
mips: lantiq: copy built-in DTB out of init section
Browse files Browse the repository at this point in the history
The existing code is buggy because built-in DTBs are in init memory.
Fix this by using the unflatten_and_copy_device_tree function.

This removes all accesses to FDT header data by the arch code.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Tested-by: Grant Likely <grant.likely@linaro.org>
  • Loading branch information
Rob Herring committed Apr 30, 2014
1 parent 8c97cec commit 10fbdaa
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions arch/mips/lantiq/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,7 @@ void __init plat_mem_setup(void)

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)
Expand Down

0 comments on commit 10fbdaa

Please sign in to comment.