diff options
Diffstat (limited to 'arch/ppc64/kernel/pmac_setup.c')
-rw-r--r-- | arch/ppc64/kernel/pmac_setup.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c index c059805d8cce..c3ea73df937d 100644 --- a/arch/ppc64/kernel/pmac_setup.c +++ b/arch/ppc64/kernel/pmac_setup.c | |||
@@ -274,48 +274,6 @@ static void pmac_halt(void) | |||
274 | pmac_power_off(); | 274 | pmac_power_off(); |
275 | } | 275 | } |
276 | 276 | ||
277 | #ifdef CONFIG_BOOTX_TEXT | ||
278 | static void btext_putc(unsigned char c) | ||
279 | { | ||
280 | btext_drawchar(c); | ||
281 | } | ||
282 | |||
283 | static void __init init_boot_display(void) | ||
284 | { | ||
285 | char *name; | ||
286 | struct device_node *np = NULL; | ||
287 | int rc = -ENODEV; | ||
288 | |||
289 | printk("trying to initialize btext ...\n"); | ||
290 | |||
291 | name = (char *)get_property(of_chosen, "linux,stdout-path", NULL); | ||
292 | if (name != NULL) { | ||
293 | np = of_find_node_by_path(name); | ||
294 | if (np != NULL) { | ||
295 | if (strcmp(np->type, "display") != 0) { | ||
296 | printk("boot stdout isn't a display !\n"); | ||
297 | of_node_put(np); | ||
298 | np = NULL; | ||
299 | } | ||
300 | } | ||
301 | } | ||
302 | if (np) | ||
303 | rc = btext_initialize(np); | ||
304 | if (rc == 0) | ||
305 | return; | ||
306 | |||
307 | for (np = NULL; (np = of_find_node_by_type(np, "display"));) { | ||
308 | if (get_property(np, "linux,opened", NULL)) { | ||
309 | printk("trying %s ...\n", np->full_name); | ||
310 | rc = btext_initialize(np); | ||
311 | printk("result: %d\n", rc); | ||
312 | } | ||
313 | if (rc == 0) | ||
314 | return; | ||
315 | } | ||
316 | } | ||
317 | #endif /* CONFIG_BOOTX_TEXT */ | ||
318 | |||
319 | /* | 277 | /* |
320 | * Early initialization. | 278 | * Early initialization. |
321 | */ | 279 | */ |
@@ -333,13 +291,6 @@ static void __init pmac_init_early(void) | |||
333 | sccdbg = 1; | 291 | sccdbg = 1; |
334 | udbg_init_scc(NULL); | 292 | udbg_init_scc(NULL); |
335 | } | 293 | } |
336 | #ifdef CONFIG_BOOTX_TEXT | ||
337 | else { | ||
338 | init_boot_display(); | ||
339 | |||
340 | udbg_putc = btext_putc; | ||
341 | } | ||
342 | #endif /* CONFIG_BOOTX_TEXT */ | ||
343 | 294 | ||
344 | /* Setup interrupt mapping options */ | 295 | /* Setup interrupt mapping options */ |
345 | ppc64_interrupt_controller = IC_OPEN_PIC; | 296 | ppc64_interrupt_controller = IC_OPEN_PIC; |