From 2b51d58ca22620d77f16fac90c37796baf2a6465 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 11 Nov 2005 16:42:12 +1100 Subject: [PATCH] --- yaml --- r: 13863 b: refs/heads/master c: 35cd8785de39c90a52287d0f041cff8a792eaa74 h: refs/heads/master i: 13861: 16fa68f299558097d9335a83dc91f6cece87f275 13859: b144f5924c5208e72e5710e5d722e8749f4874b1 13855: 08ac41bf17869f4a149f13343f832b4ca6955a06 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/Makefile | 6 +++++- trunk/arch/{ppc64 => powerpc}/kernel/udbg.c | 0 trunk/arch/{ppc64 => powerpc}/kernel/udbg_16550.c | 0 trunk/arch/{ppc64 => powerpc}/kernel/udbg_scc.c | 0 trunk/arch/ppc64/kernel/Makefile | 7 ------- trunk/include/{asm-ppc64 => asm-powerpc}/udbg.h | 14 +++++++------- 7 files changed, 13 insertions(+), 16 deletions(-) rename trunk/arch/{ppc64 => powerpc}/kernel/udbg.c (100%) rename trunk/arch/{ppc64 => powerpc}/kernel/udbg_16550.c (100%) rename trunk/arch/{ppc64 => powerpc}/kernel/udbg_scc.c (100%) rename trunk/include/{asm-ppc64 => asm-powerpc}/udbg.h (90%) diff --git a/[refs] b/[refs] index a0ca6262829b..7543c1f5b92e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7df61a0e2b6300d8b8349c1e5e87a4336c0ab38 +refs/heads/master: 35cd8785de39c90a52287d0f041cff8a792eaa74 diff --git a/trunk/arch/powerpc/kernel/Makefile b/trunk/arch/powerpc/kernel/Makefile index c04bbd320594..c68eace12a9d 100644 --- a/trunk/arch/powerpc/kernel/Makefile +++ b/trunk/arch/powerpc/kernel/Makefile @@ -16,7 +16,7 @@ obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ signal_64.o ptrace32.o systbl.o \ paca.o ioctl32.o cpu_setup_power4.o \ - firmware.o sysfs.o + firmware.o sysfs.o udbg.o obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o obj-$(CONFIG_POWER4) += idle_power4.o obj-$(CONFIG_PPC_OF) += of_device.o @@ -29,6 +29,10 @@ obj-$(CONFIG_RTAS_PROC) += rtas-proc.o obj-$(CONFIG_LPARCFG) += lparcfg.o obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o +obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o +obj-$(CONFIG_PPC_MAPLE) += udbg_16550.o +udbgscc-$(CONFIG_PPC64) := udbg_scc.o +obj-$(CONFIG_PPC_PMAC) += $(udbgscc-y) ifeq ($(CONFIG_PPC_MERGE),y) diff --git a/trunk/arch/ppc64/kernel/udbg.c b/trunk/arch/powerpc/kernel/udbg.c similarity index 100% rename from trunk/arch/ppc64/kernel/udbg.c rename to trunk/arch/powerpc/kernel/udbg.c diff --git a/trunk/arch/ppc64/kernel/udbg_16550.c b/trunk/arch/powerpc/kernel/udbg_16550.c similarity index 100% rename from trunk/arch/ppc64/kernel/udbg_16550.c rename to trunk/arch/powerpc/kernel/udbg_16550.c diff --git a/trunk/arch/ppc64/kernel/udbg_scc.c b/trunk/arch/powerpc/kernel/udbg_scc.c similarity index 100% rename from trunk/arch/ppc64/kernel/udbg_scc.c rename to trunk/arch/powerpc/kernel/udbg_scc.c diff --git a/trunk/arch/ppc64/kernel/Makefile b/trunk/arch/ppc64/kernel/Makefile index 58b19f107656..7bf1a6f6f401 100644 --- a/trunk/arch/ppc64/kernel/Makefile +++ b/trunk/arch/ppc64/kernel/Makefile @@ -13,7 +13,6 @@ endif obj-y += idle.o dma.o \ align.o \ - udbg.o \ rtc.o \ iommu.o vdso.o obj-y += vdso32/ vdso64/ @@ -27,8 +26,6 @@ ifneq ($(CONFIG_PPC_MERGE),y) obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o endif -obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o - obj-$(CONFIG_KEXEC) += machine_kexec.o obj-$(CONFIG_MODULES) += module.o ifneq ($(CONFIG_PPC_MERGE),y) @@ -40,10 +37,6 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o endif obj-$(CONFIG_HVCS) += hvcserver.o -obj-$(CONFIG_PPC_PMAC) += udbg_scc.o - -obj-$(CONFIG_PPC_MAPLE) += udbg_16550.o - obj-$(CONFIG_KPROBES) += kprobes.o ifneq ($(CONFIG_PPC_MERGE),y) diff --git a/trunk/include/asm-ppc64/udbg.h b/trunk/include/asm-powerpc/udbg.h similarity index 90% rename from trunk/include/asm-ppc64/udbg.h rename to trunk/include/asm-powerpc/udbg.h index e3b927991851..a383383bc4d4 100644 --- a/trunk/include/asm-ppc64/udbg.h +++ b/trunk/include/asm-powerpc/udbg.h @@ -1,9 +1,3 @@ -#ifndef __UDBG_HDR -#define __UDBG_HDR - -#include -#include - /* * c 2001 PPC 64 Team, IBM Corp * @@ -13,6 +7,12 @@ * 2 of the License, or (at your option) any later version. */ +#ifndef _ASM_POWERPC_UDBG_H +#define _ASM_POWERPC_UDBG_H + +#include +#include + extern void (*udbg_putc)(unsigned char c); extern unsigned char (*udbg_getc)(void); extern int (*udbg_getc_poll)(void); @@ -28,4 +28,4 @@ extern void udbg_init_uart(void __iomem *comport, unsigned int speed); struct device_node; extern void udbg_init_scc(struct device_node *np); -#endif +#endif /* _ASM_POWERPC_UDBG_H */