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 git://git.denx.de/u-boot
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc512x
/
start.S
diff --git
a/arch/powerpc/cpu/mpc512x/start.S
b/arch/powerpc/cpu/mpc512x/start.S
index d26b61707e07057c8d82c74af0579b3150d10490..ed362d87aa440ee04b2c9cb347fde923ccbcd5f8 100644
(file)
--- a/
arch/powerpc/cpu/mpc512x/start.S
+++ b/
arch/powerpc/cpu/mpc512x/start.S
@@
-29,8
+29,11
@@
* U-Boot - Startup Code for MPC512x based Embedded Boards
*/
* U-Boot - Startup Code for MPC512x based Embedded Boards
*/
+#include <asm-offsets.h>
#include <config.h>
#include <config.h>
-#include <timestamp.h>
+#ifndef CONFIG_IDENT_STRING
+#define CONFIG_IDENT_STRING "MPC512X"
+#endif
#include <version.h>
#define CONFIG_521X 1 /* needed for Linux kernel header files*/
#include <version.h>
#define CONFIG_521X 1 /* needed for Linux kernel header files*/
@@
-43,10
+46,7
@@
#include <asm/cache.h>
#include <asm/mmu.h>
#include <asm/cache.h>
#include <asm/mmu.h>
-
-#ifndef CONFIG_IDENT_STRING
-#define CONFIG_IDENT_STRING "MPC512X"
-#endif
+#include <asm/u-boot.h>
/*
* Floating Point enable, Machine Check and Recoverable Interr.
/*
* Floating Point enable, Machine Check and Recoverable Interr.
@@
-77,7
+77,7
@@
GOT_ENTRY(transfer_to_handler)
GOT_ENTRY(__init_end)
GOT_ENTRY(transfer_to_handler)
GOT_ENTRY(__init_end)
- GOT_ENTRY(_
end
)
+ GOT_ENTRY(_
_bss_end__
)
GOT_ENTRY(__bss_start)
END_GOT
GOT_ENTRY(__bss_start)
END_GOT
@@
-87,9
+87,7
@@
.long 0x27051956 /* U-Boot Magic Number */
.globl version_string
version_string:
.long 0x27051956 /* U-Boot Magic Number */
.globl version_string
version_string:
- .ascii U_BOOT_VERSION
- .ascii " (", U_BOOT_DATE, " - ", U_BOOT_TIME, ")"
- .ascii " ", CONFIG_IDENT_STRING, "\0"
+ .ascii U_BOOT_VERSION_STRING, "\0"
/*
* Vector Table
/*
* Vector Table
@@
-100,7
+98,6
@@
version_string:
.globl _start
/* Start from here after reset/power on */
_start:
.globl _start
/* Start from here after reset/power on */
_start:
- li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
b boot_cold
.globl _start_of_vectors
b boot_cold
.globl _start_of_vectors
@@
-260,8
+257,6
@@
in_flash:
/* run low-level CPU init code (in Flash) */
bl cpu_init_f
/* run low-level CPU init code (in Flash) */
bl cpu_init_f
- /* r3: BOOTFLAG */
- mr r3, r21
/* run 1st part of board init code (in Flash) */
bl board_init_f
/* run 1st part of board init code (in Flash) */
bl board_init_f
@@
-615,17
+610,19
@@
in_ram:
beq 4f
3: lwzu r4,4(r3)
lwzux r0,r4,r11
beq 4f
3: lwzu r4,4(r3)
lwzux r0,r4,r11
+ cmpwi r0,0
add r0,r0,r11
add r0,r0,r11
- stw r10,0(r3)
+ stw r4,0(r3)
+ beq- 5f
stw r0,0(r4)
stw r0,0(r4)
-
bdnz 3b
+
5:
bdnz 3b
4:
clear_bss:
/*
* Now clear BSS segment
*/
lwz r3,GOT(__bss_start)
4:
clear_bss:
/*
* Now clear BSS segment
*/
lwz r3,GOT(__bss_start)
- lwz r4,GOT(_
end
)
+ lwz r4,GOT(_
_bss_end__
)
cmplw 0, r3, r4
beq 6f
cmplw 0, r3, r4
beq 6f