renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-02 10:23:55 +08:00
Code

xtensa: use unflatten_and_copy_device_tree

Browse Source 
Use the common unflatten_and_copy_device_tree to copy the built-in FDT
out of init section.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Chris Zankel <chris@zankel.net>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-xtensa@linux-xtensa.org
Acked-by: Grant Likely <grant.likely@linaro.org>
This commit is contained in:
Rob Herring 2013-08-26 11:24:11 -05:00
parent 21c561bda1
commit 3104021c12
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/xtensa/kernel/setup.c
View File

@ -21,11 +21,8 @@
#include <linux/screen_info.h> #include <linux/screen_info.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#ifdef CONFIG_OF
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#endif
#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE)
# include <linux/console.h> # include <linux/console.h>
@ -252,17 +249,6 @@ void __init early_init_devtree(void *params)
of_scan_flat_dt(early_init_dt_scan_memory, NULL); of_scan_flat_dt(early_init_dt_scan_memory, NULL);
} }
static void __init copy_devtree(void)
{
void *alloc = early_init_dt_alloc_memory_arch(
be32_to_cpu(initial_boot_params->totalsize), 8);
if (alloc) {
memcpy(alloc, initial_boot_params,
be32_to_cpu(initial_boot_params->totalsize));
initial_boot_params = alloc;
}
}
static int __init xtensa_device_probe(void) static int __init xtensa_device_probe(void)
{ {
of_platform_populate(NULL, NULL, NULL, NULL); of_platform_populate(NULL, NULL, NULL, NULL);
@ -525,10 +511,7 @@ void __init setup_arch(char **cmdline_p)
bootmem_init(); bootmem_init();
#ifdef CONFIG_OF unflatten_and_copy_device_tree();
copy_devtree();
unflatten_device_tree();
#endif
platform_setup(cmdline_p); platform_setup(cmdline_p);