projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce0f709
)
powerpc/85xx: Fix setting of EPAPR_MAGIC value
author
Kumar Gala
<galak@kernel.crashing.org>
Thu, 21 Jul 2011 21:50:22 +0000
(16:50 -0500)
committer
Kumar Gala
<galak@kernel.crashing.org>
Fri, 29 Jul 2011 13:53:37 +0000
(08:53 -0500)
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>
arch/powerpc/lib/bootm.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/lib/bootm.c
b/arch/powerpc/lib/bootm.c
index 4e0cb8f3bf5e20854d04786a4e18be4f94eb5ac1..05adadabb7e38183e030a7777a352d39b461501c 100644
(file)
--- 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_
MPC
85xx) || defined(CONFIG_440)
#define EPAPR_MAGIC (0x45504150)
#else
#define EPAPR_MAGIC (0x65504150)