OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0302f12
)
[POWERPC] Fix early btext debug on PowerMac
author
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Tue, 13 Nov 2007 02:46:52 +0000
(13:46 +1100)
committer
Paul Mackerras
<paulus@samba.org>
Tue, 13 Nov 2007 05:22:44 +0000
(16:22 +1100)
The early btext debug wouldn't work on PowerMac when booted from BootX
due to the code looking for the wrong property name.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/btext.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/kernel/btext.c
b/arch/powerpc/kernel/btext.c
index
3ef51fb
..
9c74fdf
100644
(file)
--- a/
arch/powerpc/kernel/btext.c
+++ b/
arch/powerpc/kernel/btext.c
@@
-186,7
+186,9
@@
int btext_initialize(struct device_node *np)
pitch = *prop;
if (pitch == 1)
pitch = 0x1000;
- prop = of_get_property(np, "address", NULL);
+ prop = of_get_property(np, "linux,bootx-addr", NULL);
+ if (prop == NULL)
+ prop = of_get_property(np, "address", NULL);
if (prop)
address = *prop;