A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 19:51:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

of/flattree: merge early_init_dt_scan_chosen()

Browse source 
Merge common code between PowerPC and Microblaze.  This patch
splits the arch-specific stuff out into a new function,
early_init_dt_scan_chosen_arch().

Signed-off-by: Grant Likely <[email protected]>
Tested-by: Wolfram Sang <[email protected]>
Acked-by: Benjamin Herrenschmidt <[email protected]>
This commit is contained in:
Grant Likely 2009-12-10 23:42:21 -07:00
commit 86e0322134
4 changed files with 53 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

38
drivers/of/fdt.c
View file

@ -15,6 +15,10 @@
#include <linux/of.h>
#include <linux/of_fdt.h>
#ifdef CONFIG_PPC
#include <asm/machdep.h>
#endif /* CONFIG_PPC */
int __initdata dt_root_addr_cells;
int __initdata dt_root_size_cells;
@ -440,6 +444,40 @@ u64 __init dt_mem_next_cell(int s, u32 **cellp)
return of_read_number(p, s);
}
int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
int depth, void *data)
{
unsigned long l;
char *p;
pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);
if (depth != 1 ||
(strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
return 0;
early_init_dt_check_for_initrd(node);
/* Retreive command line */
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE));
#ifdef CONFIG_CMDLINE
#ifndef CONFIG_CMDLINE_FORCE
if (p == NULL || l == 0 || (l == 1 && (*p) == 0))
#endif
strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
#endif /* CONFIG_CMDLINE */
early_init_dt_scan_chosen_arch(node);
pr_debug("Command line is: %s\n", cmd_line);
/* break now */
return 1;
}
/**
* unflatten_device_tree - create tree of device_nodes from flat blob
*