浏览代码

[POWERPC] Fix early btext debug on PowerMac

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>
Benjamin Herrenschmidt 17 年之前
父节点
当前提交
b7a2da1199
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      arch/powerpc/kernel/btext.c

+ 3 - 1
arch/powerpc/kernel/btext.c

@@ -186,7 +186,9 @@ int btext_initialize(struct device_node *np)
 		pitch = *prop;
 		pitch = *prop;
 	if (pitch == 1)
 	if (pitch == 1)
 		pitch = 0x1000;
 		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)
 	if (prop)
 		address = *prop;
 		address = *prop;