From: Kumar Gala <galak@kernel.crashing.org>
Date: Thu, 21 Jul 2011 21:50:22 +0000 (-0500)
Subject: powerpc/85xx: Fix setting of EPAPR_MAGIC value
X-Git-Tag: v2011.09-rc1~105^2~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=70bfb032ec592c99f78791305641b22f85fb52db;p=u-boot

powerpc/85xx: Fix setting of EPAPR_MAGIC value

Had a typo in the ifdef for 85xx, should be CONFIG_MPC85xx for it to get
triggered.  Was pull in the non-BookE magic number.

Reported-by: John Cortell
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 4e0cb8f3bf..05adadabb7 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -87,7 +87,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 		 *   r8: 0
 		 *   r9: 0
 		 */
-#if defined(CONFIG_85xx) || defined(CONFIG_440)
+#if defined(CONFIG_MPC85xx) || defined(CONFIG_440)
  #define EPAPR_MAGIC	(0x45504150)
 #else
  #define EPAPR_MAGIC	(0x65504150)