* [PATCH] powerpc: Only call prom_init of we have true OpenFirmware
@ 2005-12-21 2:55 Kumar Gala
0 siblings, 0 replies; only message in thread
From: Kumar Gala @ 2005-12-21 2:55 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
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@kernel.crashing.org>
---
commit 51929bc009670733f84dc5dc48711fb3f1cb1554
tree 9ee9a1d7c49f3ee0e5984b0834fb2daa89cca394
parent c9b626087d0381681d5ae4132ca2ac2295f78447
author Kumar Gala <galak@kernel.crashing.org> Tue, 20 Dec 2005 20:59:03 -0600
committer Kumar Gala <galak@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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2005-12-21 2:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-12-21 2:55 [PATCH] powerpc: Only call prom_init of we have true OpenFirmware Kumar Gala
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).