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

Commit 9b6b563c authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Merge in the ppc64 version of the prom code. 



This brings in the ppc64 version of prom_init.c, prom.c and btext.c
and makes them work for ppc32.  This also brings in the new calling
convention, where the first entry to the kernel (with r5 != 0) goes
to the prom_init code, which then restarts from the beginning (with
r5 == 0) after it has done its stuff.

For now this also brings in the ppc32 version of setup.c.  It also
merges lmb.h.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b85a046a

arch/powerpc/kernel/Makefile

+7 −4
Original line number Diff line number Diff line
@@ -5,10 +5,11 @@ 
ifeq ($(CONFIG_PPC64),y)

EXTRA_CFLAGS	+= -mno-minimal-toc

endif



ifeq ($(CONFIG_PPC32),y)

extra-$(CONFIG_PPC_STD_MMU)	:= head.o

CFLAGS_prom_init.o      += -fPIC

endif



extra-$(CONFIG_PPC_STD_MMU)	:= head.o

extra-$(CONFIG_PPC64)		:= head_64.o

extra-$(CONFIG_40x)		:= head_4xx.o

extra-$(CONFIG_44x)		:= head_44x.o
@@ -18,13 +19,15 @@ extra-$(CONFIG_6xx) += idle_6xx.o 
extra-$(CONFIG_PPC_FPU)		+= fpu.o

extra-y				+= vmlinux.lds



obj-y				:= traps.o

obj-$(CONFIG_PPC32)		+= semaphore.o process.o

obj-y				:= traps.o prom.o semaphore.o

obj-$(CONFIG_PPC32)		+= setup.o process.o

obj-$(CONFIG_PPC64)		+= idle_power4.o

ifeq ($(CONFIG_PPC32),y)

obj-$(CONFIG_PPC_OF)		+= prom_init.o

obj-$(CONFIG_MODULES)		+= ppc_ksyms.o

endif

obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o

obj-$(CONFIG_BOOTX_TEXT)	+= btext.o



ifeq ($(CONFIG_PPC_ISERIES),y)

arch/powerpc/kernel/head_64.o: arch/powerpc/platforms/iseries/lparmap.s