summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/head_32.S
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-01-09 20:17:01 +1100
committerPaul Mackerras <paulus@samba.org>2006-01-09 20:17:01 +1100
commit0a498d96a3324c16add35da0435bc7c13b6c6f3f (patch)
tree0fb383f555534ffc7a7796f58c1aba8b2ca5a887 /arch/powerpc/kernel/head_32.S
parentbce6c5fd8cc5d3f8d02fd34a24b591fc3e23a775 (diff)
downloadlinux-0a498d96a3324c16add35da0435bc7c13b6c6f3f.tar.bz2
powerpc: set CONFIG_PPC_OF=y always for ARCH=powerpc
The CONFIG_PPC_OF symbol is used to mean that the firmware device tree access functions are available. Since we always have a device tree with ARCH=powerpc, make CONFIG_PPC_OF always Y for ARCH=powerpc. This fixes some compile errors reported by Kumar Gala, but in a different way to his patch. This also makes prom_parse.o be compiled only if CONFIG_PPC_OF so that non-OF ARCH=ppc platforms will compile. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/head_32.S')
-rw-r--r--arch/powerpc/kernel/head_32.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index bf37ef2b3aac..03b25f9359f8 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -120,10 +120,12 @@ __start:
* because OF may have I/O devices mapped into that area
* (particularly on CHRP).
*/
+#ifdef CONFIG_PPC_MULTIPLATFORM
cmpwi 0,r5,0
beq 1f
bl prom_init
trap
+#endif
/*
* Check for BootX signature when supporting PowerMac and branch to