projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
processor.h
diff --git
a/arch/powerpc/include/asm/processor.h
b/arch/powerpc/include/asm/processor.h
index
7aa3231
..
19fe250
100644
(file)
--- a/
arch/powerpc/include/asm/processor.h
+++ b/
arch/powerpc/include/asm/processor.h
@@
-1342,4
+1342,10
@@
void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
#endif
#endif /* CONFIG_MACH_SPECIFIC */
+#if defined(CONFIG_MPC85xx) || defined(CONFIG_440)
+ #define EPAPR_MAGIC (0x45504150)
+#else
+ #define EPAPR_MAGIC (0x65504150)
+#endif
+
#endif /* __ASM_PPC_PROCESSOR_H */