diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2005-11-11 00:42:12 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-11 06:23:34 -0500 |
commit | 35cd8785de39c90a52287d0f041cff8a792eaa74 (patch) | |
tree | e45b94be971992d21f06086ef2ae443b90fd621b /arch/ppc64/kernel/Makefile | |
parent | a7df61a0e2b6300d8b8349c1e5e87a4336c0ab38 (diff) |
[PATCH] powerpc: Move udbg code to arch/powerpc
Since the udbg code in ppc64 has no ppc32 equivalent, move it straight
over into arch/powerpc (and include/asm-powerpc for udbg.h). In time,
we probably want to meld the various bits and pieces of 32-bit early
debugging code into udbg, but for now only include it on
CONFIG_PPC64=y builds. The only change during the move is to
standardise the protecting #ifdef/#define in udbg.h, and move its
banner comment above the initial #ifdef (which seems to be normal
practice).
Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64). Built
for 32bit multiplatform (ARCH=powerpc).
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
-rw-r--r-- | arch/ppc64/kernel/Makefile | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index 58b19f107656..7bf1a6f6f401 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
@@ -13,7 +13,6 @@ endif | |||
13 | 13 | ||
14 | obj-y += idle.o dma.o \ | 14 | obj-y += idle.o dma.o \ |
15 | align.o \ | 15 | align.o \ |
16 | udbg.o \ | ||
17 | rtc.o \ | 16 | rtc.o \ |
18 | iommu.o vdso.o | 17 | iommu.o vdso.o |
19 | obj-y += vdso32/ vdso64/ | 18 | obj-y += vdso32/ vdso64/ |
@@ -27,8 +26,6 @@ ifneq ($(CONFIG_PPC_MERGE),y) | |||
27 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o | 26 | obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o |
28 | endif | 27 | endif |
29 | 28 | ||
30 | obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o | ||
31 | |||
32 | obj-$(CONFIG_KEXEC) += machine_kexec.o | 29 | obj-$(CONFIG_KEXEC) += machine_kexec.o |
33 | obj-$(CONFIG_MODULES) += module.o | 30 | obj-$(CONFIG_MODULES) += module.o |
34 | ifneq ($(CONFIG_PPC_MERGE),y) | 31 | ifneq ($(CONFIG_PPC_MERGE),y) |
@@ -40,10 +37,6 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o | |||
40 | endif | 37 | endif |
41 | obj-$(CONFIG_HVCS) += hvcserver.o | 38 | obj-$(CONFIG_HVCS) += hvcserver.o |
42 | 39 | ||
43 | obj-$(CONFIG_PPC_PMAC) += udbg_scc.o | ||
44 | |||
45 | obj-$(CONFIG_PPC_MAPLE) += udbg_16550.o | ||
46 | |||
47 | obj-$(CONFIG_KPROBES) += kprobes.o | 40 | obj-$(CONFIG_KPROBES) += kprobes.o |
48 | 41 | ||
49 | ifneq ($(CONFIG_PPC_MERGE),y) | 42 | ifneq ($(CONFIG_PPC_MERGE),y) |