]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
[PATCH] powerpc: Unify udbg (#2)
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 23 Nov 2005 06:57:25 +0000 (17:57 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 9 Jan 2006 03:49:54 +0000 (14:49 +1100)
commit51d3082fe6e55aecfa17113dbe98077c749f724c
tree9a1e2355d5988d8cc1ca511d53c1bb24b0baa17f
parent463ce0e103f419f51b1769111e73fe8bb305d0ec
[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>
29 files changed:
arch/powerpc/Kconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/btext.c
arch/powerpc/kernel/head_32.S
arch/powerpc/kernel/setup_32.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/udbg.c
arch/powerpc/kernel/udbg_16550.c
arch/powerpc/mm/init_32.c
arch/powerpc/platforms/powermac/Makefile
arch/powerpc/platforms/powermac/feature.c
arch/powerpc/platforms/powermac/low_i2c.c
arch/powerpc/platforms/powermac/pic.c
arch/powerpc/platforms/powermac/setup.c
arch/powerpc/platforms/powermac/udbg_adb.c [new file with mode: 0644]
arch/powerpc/platforms/powermac/udbg_scc.c [moved from arch/powerpc/kernel/udbg_scc.c with 66% similarity]
arch/powerpc/platforms/pseries/lpar.c
arch/powerpc/xmon/Makefile
arch/powerpc/xmon/start.c [moved from arch/powerpc/xmon/start_64.c with 100% similarity]
arch/powerpc/xmon/start_32.c [deleted file]
arch/powerpc/xmon/start_8xx.c [deleted file]
arch/ppc/kernel/setup.c
drivers/i2c/busses/i2c-keywest.c
drivers/macintosh/via-cuda.c
drivers/macintosh/via-pmu.c
include/asm-powerpc/btext.h
include/asm-powerpc/udbg.h
include/asm-ppc/btext.h
include/asm-ppc/machdep.h