powerpc/pmac: Early debug output on screen on 64-bit macs

[profile/ivi/kernel-x86-ivi.git] / arch / powerpc / kernel / prom_init.c

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 6079024..57df5cb 100644 (file)
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2082,6 +2082,22 @@ static void __init prom_check_displays(void)
                                           clut[2]) != 0)
                                break;
 #endif /* CONFIG_LOGO_LINUX_CLUT224 */
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_BOOTX
+               if (prom_getprop(node, "linux,boot-display", NULL, 0) !=
+                   PROM_ERROR) {
+                       u32 width, height, pitch, addr;
+
+                       prom_printf("Setting btext !\n");
+                       prom_getprop(node, "width", &width, 4);
+                       prom_getprop(node, "height", &height, 4);
+                       prom_getprop(node, "linebytes", &pitch, 4);
+                       prom_getprop(node, "address", &addr, 4);
+                       prom_printf("W=%d H=%d LB=%d addr=0x%x\n",
+                                   width, height, pitch, addr);
+                       btext_setup_display(width, height, 8, pitch, addr);
+               }
+#endif /* CONFIG_PPC_EARLY_DEBUG_BOOTX */
        }
 }