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 remote-tracking branch 'u-boot-ti/master'
[oweals/u-boot.git]
/
arch
/
m68k
/
cpu
/
mcf532x
/
start.S
diff --git
a/arch/m68k/cpu/mcf532x/start.S
b/arch/m68k/cpu/mcf532x/start.S
index 53ac471a416905352622ed16581eb174d004a516..583ed1d41ac1c50037878bc7805fb6edf1ce0671 100644
(file)
--- a/
arch/m68k/cpu/mcf532x/start.S
+++ b/
arch/m68k/cpu/mcf532x/start.S
@@
-26,7
+26,6
@@
#include <asm-offsets.h>
#include <config.h>
#include <asm-offsets.h>
#include <config.h>
-#include <timestamp.h>
#include "version.h"
#include <asm/cache.h>
#include "version.h"
#include <asm/cache.h>
@@
-262,7
+261,7
@@
clear_bss:
/* exception code */
.globl _fault
_fault:
/* exception code */
.globl _fault
_fault:
-
jmp
_fault
+
bra
_fault
.globl _exc_handler
_exc_handler:
.globl _exc_handler
_exc_handler:
@@
-283,7
+282,5
@@
_int_handler:
/*------------------------------------------------------------------------------*/
.globl version_string
version_string:
/*------------------------------------------------------------------------------*/
.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"
.align 4
.align 4