projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' into cleanups
[oweals/u-boot.git]
/
cpu
/
mpc85xx
/
start.S
diff --git
a/cpu/mpc85xx/start.S
b/cpu/mpc85xx/start.S
index fc3c3368afb606772f4a8fdf39c1058157eddbf2..8fa0ff7a8a591148e81069ce67ccb748ec38c1a2 100644
(file)
--- a/
cpu/mpc85xx/start.S
+++ b/
cpu/mpc85xx/start.S
@@
-30,6
+30,7
@@
#include <config.h>
#include <mpc85xx.h>
#include <config.h>
#include <mpc85xx.h>
+#include <timestamp.h>
#include <version.h>
#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */
#include <version.h>
#define _LINUX_CONFIG_H 1 /* avoid reading Linux autoconf.h file */
@@
-163,8
+164,10
@@
_start_e500:
ori r0,r0,HID0_TBEN@l /* Enable Timebase */
mtspr HID0,r0
ori r0,r0,HID0_TBEN@l /* Enable Timebase */
mtspr HID0,r0
+#ifndef CONFIG_E500MC
li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */
mtspr HID1,r0
li r0,(HID1_ASTME|HID1_ABE)@l /* Addr streaming & broadcast */
mtspr HID1,r0
+#endif
/* Enable Branch Prediction */
#if defined(CONFIG_BTB)
/* Enable Branch Prediction */
#if defined(CONFIG_BTB)
@@
-272,7
+275,7
@@
_start:
.globl version_string
version_string:
.ascii U_BOOT_VERSION
.globl version_string
version_string:
.ascii U_BOOT_VERSION
- .ascii " (",
__DATE__, " - ", __TIME__
, ")"
+ .ascii " (",
U_BOOT_DATE, " - ", U_BOOT_TIME
, ")"
.ascii CONFIG_IDENT_STRING, "\0"
.align 4
.ascii CONFIG_IDENT_STRING, "\0"
.align 4
@@
-998,8
+1001,8
@@
trap_reloc:
.globl unlock_ram_in_cache
unlock_ram_in_cache:
/* invalidate the INIT_RAM section */
.globl unlock_ram_in_cache
unlock_ram_in_cache:
/* invalidate the INIT_RAM section */
- lis r3,(CONFIG_SYS_INIT_RAM_ADDR & ~
31
)@h
- ori r3,r3,(CONFIG_SYS_INIT_RAM_ADDR & ~
31
)@l
+ lis r3,(CONFIG_SYS_INIT_RAM_ADDR & ~
(CONFIG_SYS_CACHELINE_SIZE-1)
)@h
+ ori r3,r3,(CONFIG_SYS_INIT_RAM_ADDR & ~
(CONFIG_SYS_CACHELINE_SIZE-1)
)@l
mfspr r4,L1CFG0
andi. r4,r4,0x1ff
slwi r4,r4,(10 - 1 - L1_CACHE_SHIFT)
mfspr r4,L1CFG0
andi. r4,r4,0x1ff
slwi r4,r4,(10 - 1 - L1_CACHE_SHIFT)