diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-28 02:33:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-28 02:33:43 +0100 |
| commit | c57ec52f2647e53709c3ce8d86b28876c2f32de0 (patch) | |
| tree | 4f7dcb65b661f80184810abfe916bb3ec626a2f1 /arch/sparc/kernel/setup_64.c | |
| parent | Revert "sparc: Make atomic locks raw" (diff) | |
| download | linux-c57ec52f2647e53709c3ce8d86b28876c2f32de0.tar.xz linux-c57ec52f2647e53709c3ce8d86b28876c2f32de0.zip | |
sparc64: Faster early-boot framebuffer console.
Borrow the powerpc bootx text console driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/setup_64.c')
| -rw-r--r-- | arch/sparc/kernel/setup_64.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 21180339cb09..a2a79e76344f 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -46,6 +46,7 @@ #include <asm/setup.h> #include <asm/mmu.h> #include <asm/ns87303.h> +#include <asm/btext.h> #ifdef CONFIG_IP_PNP #include <net/ipconfig.h> @@ -286,7 +287,10 @@ void __init setup_arch(char **cmdline_p) parse_early_param(); boot_flags_init(*cmdline_p); - register_console(&prom_early_console); +#ifdef CONFIG_EARLYFB + if (btext_find_display()) +#endif + register_console(&prom_early_console); if (tlb_type == hypervisor) printk("ARCH: SUN4V\n"); |