[PATCH] powerpc: Only call prom_init of we have true OpenFirmware

Kumar Gala galak at gate.crashing.org
Wed Dec 21 13:55:11 EST 2005


We should only have prom_init built if we are CONFIG_PPC_OF. CONFIG_PPC_OF
is intended to imply we are booted by a full Open Firmware implementation.

Signed-off-by: Kumar Gala <galak at kernel.crashing.org>

---
commit 51929bc009670733f84dc5dc48711fb3f1cb1554
tree 9ee9a1d7c49f3ee0e5984b0834fb2daa89cca394
parent c9b626087d0381681d5ae4132ca2ac2295f78447
author Kumar Gala <galak at kernel.crashing.org> Tue, 20 Dec 2005 20:59:03 -0600
committer Kumar Gala <galak at kernel.crashing.org> Tue, 20 Dec 2005 20:59:03 -0600

 arch/powerpc/kernel/head_32.S |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index bf37ef2..7c9fdd5 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_OF
 	cmpwi	0,r5,0
 	beq	1f
 	bl	prom_init
 	trap
+#endif
 
 /*
  * Check for BootX signature when supporting PowerMac and branch to




More information about the Linuxppc-dev mailing list