diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-12-11 01:42:21 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-12-11 01:42:21 -0500 |
commit | 86e032213424958b45564d0cc96b3316641a49d3 (patch) | |
tree | 34b9f5ddd49180a558a325b9ccb47140f5cc7cbd /arch/microblaze/kernel | |
parent | 0f0b56c3f2df4a083fc9e934266e5bab1710e286 (diff) |
of/flattree: merge early_init_dt_scan_chosen()
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 <grant.likely@secretlab.ca>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/microblaze/kernel')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 50d8b09d5e3f..5505bcffd7dd 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c | |||
@@ -108,49 +108,9 @@ static int __init early_init_dt_scan_cpus(unsigned long node, | |||
108 | return 0; | 108 | return 0; |
109 | } | 109 | } |
110 | 110 | ||
111 | static int __init early_init_dt_scan_chosen(unsigned long node, | 111 | void __init early_init_dt_scan_chosen_arch(unsigned long node) |
112 | const char *uname, int depth, void *data) | ||
113 | { | 112 | { |
114 | unsigned long l; | 113 | /* No Microblaze specific code here */ |
115 | char *p; | ||
116 | |||
117 | pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname); | ||
118 | |||
119 | if (depth != 1 || | ||
120 | (strcmp(uname, "chosen") != 0 && | ||
121 | strcmp(uname, "chosen@0") != 0)) | ||
122 | return 0; | ||
123 | |||
124 | #ifdef CONFIG_KEXEC | ||
125 | lprop = (u64 *)of_get_flat_dt_prop(node, | ||
126 | "linux,crashkernel-base", NULL); | ||
127 | if (lprop) | ||
128 | crashk_res.start = *lprop; | ||
129 | |||
130 | lprop = (u64 *)of_get_flat_dt_prop(node, | ||
131 | "linux,crashkernel-size", NULL); | ||
132 | if (lprop) | ||
133 | crashk_res.end = crashk_res.start + *lprop - 1; | ||
134 | #endif | ||
135 | |||
136 | early_init_dt_check_for_initrd(node); | ||
137 | |||
138 | /* Retreive command line */ | ||
139 | p = of_get_flat_dt_prop(node, "bootargs", &l); | ||
140 | if (p != NULL && l > 0) | ||
141 | strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE)); | ||
142 | |||
143 | #ifdef CONFIG_CMDLINE | ||
144 | #ifndef CONFIG_CMDLINE_FORCE | ||
145 | if (p == NULL || l == 0 || (l == 1 && (*p) == 0)) | ||
146 | #endif | ||
147 | strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); | ||
148 | #endif /* CONFIG_CMDLINE */ | ||
149 | |||
150 | pr_debug("Command line is: %s\n", cmd_line); | ||
151 | |||
152 | /* break now */ | ||
153 | return 1; | ||
154 | } | 114 | } |
155 | 115 | ||
156 | static int __init early_init_dt_scan_memory(unsigned long node, | 116 | static int __init early_init_dt_scan_memory(unsigned long node, |