mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
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: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
e0fa93d6e6
commit
be42d5fa37
2 changed files with 5 additions and 1 deletions
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue