summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/setup_64.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-27 17:33:43 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-27 17:33:43 -0800
commitc57ec52f2647e53709c3ce8d86b28876c2f32de0 (patch)
tree4f7dcb65b661f80184810abfe916bb3ec626a2f1 /arch/sparc/kernel/setup_64.c
parent55f532ec3e84410a9393d1a21b1f58518a0958bc (diff)
downloadop-kernel-dev-c57ec52f2647e53709c3ce8d86b28876c2f32de0.zip
op-kernel-dev-c57ec52f2647e53709c3ce8d86b28876c2f32de0.tar.gz
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.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 2118033..a2a79e7 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");
OpenPOWER on IntegriCloud