diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2007-02-12 23:54:22 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-02-13 19:55:16 -0500 |
commit | 719c91ccadd3ed26570dbb29d54166914832eee9 (patch) | |
tree | ee11ec26fbbb096d034468379241e872cbd63548 /arch/powerpc/kernel/btext.c | |
parent | 8d38a5b2fab1397d35ba1c92828a91b77ce9f865 (diff) |
[POWERPC] Use udbg_early_init() on ppc32
udbg_early_init() is a function used on 64 bit systems, which
initializes whichever early udbg backend is configured. This function
is not called on 32-bit, however if btext early debug is enabled it
does have an explicit, inline, #ifdef-ed assignment performing
analagous initialization.
This patch makes things more uniform by folding the btext
initialization as an option into udbg_early_init() and calling that
from the 32-bit setup path.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/btext.c')
-rw-r--r-- | arch/powerpc/kernel/btext.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c index 93f21aaf7c8e..3678997339d6 100644 --- a/arch/powerpc/kernel/btext.c +++ b/arch/powerpc/kernel/btext.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
19 | #include <asm/lmb.h> | 19 | #include <asm/lmb.h> |
20 | #include <asm/processor.h> | 20 | #include <asm/processor.h> |
21 | #include <asm/udbg.h> | ||
21 | 22 | ||
22 | #define NO_SCROLL | 23 | #define NO_SCROLL |
23 | 24 | ||
@@ -912,3 +913,11 @@ static unsigned char vga_font[cmapsz] = { | |||
912 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 913 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
913 | 0x00, 0x00, 0x00, 0x00, | 914 | 0x00, 0x00, 0x00, 0x00, |
914 | }; | 915 | }; |
916 | |||
917 | void __init udbg_init_btext(void) | ||
918 | { | ||
919 | /* If btext is enabled, we might have a BAT setup for early display, | ||
920 | * thus we do enable some very basic udbg output | ||
921 | */ | ||
922 | udbg_putc = btext_drawchar; | ||
923 | } | ||