lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: unbreak iSeries compilation again

Browse Source 
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:
Paul Mackerras
2006-01-09 21:32:42 +11:00
parent e0fa93d6e6
commit be42d5fa37
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/Makefile
View File

@@ -49,7 +49,7 @@ obj-y += process.o init_task.o time.o \
prom.o traps.o setup-common.o udbg.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_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_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_MODULES) += ppc_ksyms.o
obj-$(CONFIG_BOOTX_TEXT) += btext.o obj-$(CONFIG_BOOTX_TEXT) += btext.o
obj-$(CONFIG_6xx) += idle_6xx.o obj-$(CONFIG_6xx) += idle_6xx.o

4
arch/powerpc/kernel/head_64.S
View File

@@ -1506,11 +1506,13 @@ _STATIC(__mmu_off)
* *
*/ */
_GLOBAL(__start_initialization_multiplatform) _GLOBAL(__start_initialization_multiplatform)
#ifdef CONFIG_PPC_MULTIPLATFORM
/* /*
* Are we booted from a PROM Of-type client-interface ? * Are we booted from a PROM Of-type client-interface ?
*/ */
cmpldi cr0,r5,0 cmpldi cr0,r5,0
bne .__boot_from_prom /* yes -> prom */ bne .__boot_from_prom /* yes -> prom */
#endif
/* Save parameters */ /* Save parameters */
mr r31,r3 mr r31,r3
@@ -1531,6 +1533,7 @@ _GLOBAL(__start_initialization_multiplatform)
bl .__mmu_off bl .__mmu_off
b .__after_prom_start b .__after_prom_start
#ifdef CONFIG_PPC_MULTIPLATFORM
_STATIC(__boot_from_prom) _STATIC(__boot_from_prom)
/* Save parameters */ /* Save parameters */
mr r31,r3 mr r31,r3
@@ -1563,6 +1566,7 @@ _STATIC(__boot_from_prom)
bl .prom_init bl .prom_init
/* We never return */ /* We never return */
trap trap
#endif
/* /*
* At this point, r3 contains the physical address we are running at, * At this point, r3 contains the physical address we are running at,