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

Commit be42d5fa authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: unbreak iSeries compilation again 



We don't set CONFIG_PPC_MULTIPLATFORM on iSeries (yet).  Avoid
compiling in the prom_init stuff on iSeries.

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

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ obj-y += process.o init_task.o time.o \ 
				   prom.o traps.o setup-common.o udbg.o

obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o systbl.o

obj-$(CONFIG_PPC64)		+= misc_64.o dma_64.o iommu.o

obj-$(CONFIG_PPC_OF)		+= prom_init.o

obj-$(CONFIG_PPC_MULTIPLATFORM)	+= prom_init.o

obj-$(CONFIG_MODULES)		+= ppc_ksyms.o

obj-$(CONFIG_BOOTX_TEXT)	+= btext.o

obj-$(CONFIG_6xx)		+= idle_6xx.o

arch/powerpc/kernel/head_64.S

+4 −0
Original line number Diff line number Diff line
@@ -1506,11 +1506,13 @@ _STATIC(__mmu_off) 
 *

 */

_GLOBAL(__start_initialization_multiplatform)

#ifdef CONFIG_PPC_MULTIPLATFORM

	/*

	 * Are we booted from a PROM Of-type client-interface ?

	 */

	cmpldi	cr0,r5,0

	bne	.__boot_from_prom		/* yes -> prom */

#endif



	/* Save parameters */

	mr	r31,r3
@@ -1531,6 +1533,7 @@ _GLOBAL(__start_initialization_multiplatform) 
	bl	.__mmu_off

	b	.__after_prom_start



#ifdef CONFIG_PPC_MULTIPLATFORM

_STATIC(__boot_from_prom)

	/* Save parameters */

	mr	r31,r3
@@ -1563,6 +1566,7 @@ _STATIC(__boot_from_prom) 
	bl	.prom_init

	/* We never return */

	trap

#endif



/*

 * At this point, r3 contains the physical address we are running at,