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/setup_32.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/setup_32.c')
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 6a19fa40dcee..44a6a3c47feb 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -116,12 +116,8 @@ unsigned long __init early_init(unsigned long dt_ptr) | |||
116 | */ | 116 | */ |
117 | void __init machine_init(unsigned long dt_ptr, unsigned long phys) | 117 | void __init machine_init(unsigned long dt_ptr, unsigned long phys) |
118 | { | 118 | { |
119 | /* If btext is enabled, we might have a BAT setup for early display, | 119 | /* Enable early debugging if any specified (see udbg.h) */ |
120 | * thus we do enable some very basic udbg output | 120 | udbg_early_init(); |
121 | */ | ||
122 | #ifdef CONFIG_BOOTX_TEXT | ||
123 | udbg_putc = btext_drawchar; | ||
124 | #endif | ||
125 | 121 | ||
126 | /* Do some early initialization based on the flat device tree */ | 122 | /* Do some early initialization based on the flat device tree */ |
127 | early_init_devtree(__va(dt_ptr)); | 123 | early_init_devtree(__va(dt_ptr)); |