Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35cd8785 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[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: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a7df61a0

arch/powerpc/kernel/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -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)

arch/ppc64/kernel/udbg.c→arch/powerpc/kernel/udbg.c

+0 −0

File moved.

View file

arch/ppc64/kernel/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -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)