---

yaml --- r: 170407 b: refs/heads/master c: c57ec52 h: refs/heads/master i: 170405: bd94b31 170403: cb01eaf 170399: 79fe305 v: v3
git-mirror · Nov 28, 2009 · 77ba140 · 77ba140
1 parent a621df1
commit 77ba140
Show file tree

Hide file tree

Showing 6 changed files with 693 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55f532ec3e84410a9393d1a21b1f58518a0958bc
+refs/heads/master: c57ec52f2647e53709c3ce8d86b28876c2f32de0
diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
@@ -221,6 +221,13 @@ config SPARC64_SMP
 	default y
 	depends on SPARC64 && SMP
 
+config EARLYFB
+	bool "Support for early boot text console"
+	default y
+	depends on SPARC64
+	help
+	  Say Y here to enable a faster early framebuffer boot console.
+
 choice
 	prompt "Kernel page size" if SPARC64
 	default SPARC64_PAGE_SIZE_8KB

diff --git a/trunk/arch/sparc/include/asm/btext.h b/trunk/arch/sparc/include/asm/btext.h
@@ -0,0 +1,6 @@
+#ifndef _SPARC_BTEXT_H
+#define _SPARC_BTEXT_H
+
+extern int btext_find_display(void);
+
+#endif /* _SPARC_BTEXT_H */
diff --git a/trunk/arch/sparc/kernel/Makefile b/trunk/arch/sparc/kernel/Makefile
@@ -87,6 +87,7 @@ obj-$(CONFIG_KGDB)        += kgdb_$(BITS).o
 obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
 CFLAGS_REMOVE_ftrace.o := -pg
 
+obj-$(CONFIG_EARLYFB) += btext.o
 obj-$(CONFIG_STACKTRACE)     += stacktrace.o
 # sparc64 PCI
 obj-$(CONFIG_SPARC64_PCI)    += pci.o pci_common.o psycho_common.o