projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: Move enetaddr env access code to env config instead of net config
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc85xx
/
release.S
diff --git
a/arch/powerpc/cpu/mpc85xx/release.S
b/arch/powerpc/cpu/mpc85xx/release.S
index c15e83b521e613df5d0637c11bb7615b71ae8836..e1f12089c33e1139ee957f338d811ab38a0bc2db 100644
(file)
--- a/
arch/powerpc/cpu/mpc85xx/release.S
+++ b/
arch/powerpc/cpu/mpc85xx/release.S
@@
-8,9
+8,6
@@
#include <asm-offsets.h>
#include <config.h>
#include <mpc85xx.h>
#include <asm-offsets.h>
#include <config.h>
#include <mpc85xx.h>
-#include <version.h>
-
-#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */
#include <ppc_asm.tmpl>
#include <ppc_defs.h>
#include <ppc_asm.tmpl>
#include <ppc_defs.h>
@@
-187,12
+184,18
@@
__secondary_start_page:
mtspr SPRN_PIR,r4 /* write to PIR register */
mtspr SPRN_PIR,r4 /* write to PIR register */
+#ifdef CONFIG_SYS_FSL_ERRATUM_A007907
+ mfspr r8, L1CSR2
+ clrrwi r8, r8, 10 /* clear bit [54-63] DCSTASHID */
+ mtspr L1CSR2, r8
+#else
#ifdef CONFIG_SYS_CACHE_STASHING
/* set stash id to (coreID) * 2 + 32 + L1 CT (0) */
slwi r8,r4,1
addi r8,r8,32
mtspr L1CSR2,r8
#endif
#ifdef CONFIG_SYS_CACHE_STASHING
/* set stash id to (coreID) * 2 + 32 + L1 CT (0) */
slwi r8,r4,1
addi r8,r8,32
mtspr L1CSR2,r8
#endif
+#endif /* CONFIG_SYS_FSL_ERRATUM_A007907 */
#if defined(CONFIG_SYS_P4080_ERRATUM_CPU22) || \
defined(CONFIG_SYS_FSL_ERRATUM_NMG_CPU_A011)
#if defined(CONFIG_SYS_P4080_ERRATUM_CPU22) || \
defined(CONFIG_SYS_FSL_ERRATUM_NMG_CPU_A011)
@@
-407,9
+410,6
@@
__second_half_boot_page:
bne 3b
isync
bne 3b
isync
- /* setup IVORs to match fixed offsets */
-#include "fixed_ivor.S"
-
/* get the upper bits of the addr */
lwz r11,ENTRY_ADDR_UPPER(r10)
/* get the upper bits of the addr */
lwz r11,ENTRY_ADDR_UPPER(r10)