diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-23 17:57:25 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 14:49:54 +1100 |
| commit | 51d3082fe6e55aecfa17113dbe98077c749f724c (patch) | |
| tree | 9a1e2355d5988d8cc1ca511d53c1bb24b0baa17f /arch/powerpc/kernel/setup_64.c | |
| parent | 463ce0e103f419f51b1769111e73fe8bb305d0ec (diff) | |
| download | op-kernel-dev-51d3082fe6e55aecfa17113dbe98077c749f724c.zip op-kernel-dev-51d3082fe6e55aecfa17113dbe98077c749f724c.tar.gz | |
[PATCH] powerpc: Unify udbg (#2)
This patch unifies udbg for both ppc32 and ppc64 when building the
merged achitecture. xmon now has a single "back end". The powermac udbg
stuff gets enriched with some ADB capabilities and btext output. In
addition, the early_init callback is now called on ppc32 as well,
approx. in the same order as ppc64 regarding device-tree manipulations.
The init sequences of ppc32 and ppc64 are getting closer, I'll unify
them in a later patch.
For now, you can force udbg to the scc using "sccdbg" or to btext using
"btextdbg" on powermacs. I'll implement a cleaner way of forcing udbg
output to something else than the autodetected OF output device in a
later patch.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 0fc442a..65603e9 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -474,10 +474,6 @@ void __init setup_system(void) */ finish_device_tree(); -#ifdef CONFIG_BOOTX_TEXT - init_boot_display(); -#endif - /* * Initialize xmon */ |
