diff options
| author | David Gibson | 2007-06-27 08:54:58 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2007-06-28 11:19:28 +0200 |
| commit | 084647125227b870267859d544c91c03743816dc (patch) | |
| tree | 474fdf3b5e21ae7e6cff5f11ec8a52587bc7c898 /arch/powerpc/boot/ofconsole.c | |
| parent | [POWERPC] Turn off debugging in arch/powerpc/kernel/pci_64.c (diff) | |
| download | kernel-qcow2-linux-084647125227b870267859d544c91c03743816dc.tar.gz kernel-qcow2-linux-084647125227b870267859d544c91c03743816dc.tar.xz kernel-qcow2-linux-084647125227b870267859d544c91c03743816dc.zip | |
[POWERPC] Make more OF-related bootwrapper functions available to non-OF platforms
Commit 2e6016133755eb3cc44e8efab92573d23ed75888 split up
arch/powerpc/boot/of.c so that some OF functions can be used on
platforms that don't want to use the overall OF platform boot code.
This is useful on things like PReP which can have an OF implementation
which is useful for debugging output, but inadequate for booting.
However, that commit didn't export quite enough things to make a
usable OF console on a non-OF system. In particular, the device tree
manipulation performed to initialize the OF console code must
explicitly use the OF device tree, rather than the flattened device
tree, even if the system is otherwise booting using a flattened device
tree. This makes it so.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/ofconsole.c')
| -rw-r--r-- | arch/powerpc/boot/ofconsole.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/boot/ofconsole.c b/arch/powerpc/boot/ofconsole.c index 43c0f36c3326..ce0e02424453 100644 --- a/arch/powerpc/boot/ofconsole.c +++ b/arch/powerpc/boot/ofconsole.c @@ -24,10 +24,10 @@ static int of_console_open(void) { void *devp; - if (((devp = finddevice("/chosen")) != NULL) - && (getprop(devp, "stdout", &of_stdout_handle, - sizeof(of_stdout_handle)) - == sizeof(of_stdout_handle))) + if (((devp = of_finddevice("/chosen")) != NULL) + && (of_getprop(devp, "stdout", &of_stdout_handle, + sizeof(of_stdout_handle)) + == sizeof(of_stdout_handle))) return 0; return -1; |