aboutsummaryrefslogtreecommitdiffstats
path: root/arch/openrisc/kernel/setup.c
diff options
context:
space:
mode:
authorStefan Kristiansson <stefan.kristiansson@saunalahti.fi>2011-11-10 10:38:29 -0500
committerJonas Bonn <jonas@southpole.se>2012-02-17 03:55:22 -0500
commitdec830189e1e192a80f574243a2dc31bdc1c4fc5 (patch)
tree864ae5fd9b3975805195eb2b0396d80e6a408425 /arch/openrisc/kernel/setup.c
parent2e1c958de4e22b6badc13dba1a0ebaa5aa798664 (diff)
openrisc: enable passing of flattened device tree pointer
This patch enables passing a fdt pointer to the kernel. This makes for the kernel parameter API: void kernel(unsigned int fdt); which, in accordance with the OpenRISC ABI results in: r3 = pointer to fdt Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Signed-off-by: Jonas Bonn <jonas@southpole.se>
Diffstat (limited to 'arch/openrisc/kernel/setup.c')
-rw-r--r--arch/openrisc/kernel/setup.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index 1422f747f52b..bf5eba22ce9e 100644
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -207,18 +207,18 @@ void __init setup_cpuinfo(void)
207 * Handles the pointer to the device tree that this kernel is to use 207 * Handles the pointer to the device tree that this kernel is to use
208 * for establishing the available platform devices. 208 * for establishing the available platform devices.
209 * 209 *
210 * For now, this is limited to using the built-in device tree. In the future, 210 * Falls back on built-in device tree in case null pointer is passed.
211 * it is intended that this function will take a pointer to the device tree
212 * that is potentially built-in, but potentially also passed in by the
213 * bootloader, or discovered by some equally clever means...
214 */ 211 */
215 212
216void __init or32_early_setup(void) 213void __init or32_early_setup(unsigned int fdt)
217{ 214{
218 215 if (fdt) {
219 early_init_devtree(__dtb_start); 216 early_init_devtree((void*) fdt);
220 217 printk(KERN_INFO "FDT at 0x%08x\n", fdt);
221 printk(KERN_INFO "Compiled-in FDT at 0x%p\n", __dtb_start); 218 } else {
219 early_init_devtree(__dtb_start);
220 printk(KERN_INFO "Compiled-in FDT at %p\n", __dtb_start);
221 }
222} 222}
223 223
224static int __init openrisc_device_probe(void) 224static int __init openrisc_device_probe(void)