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 with git://www.denx.de/git/u-boot.git#testing-USB
[oweals/u-boot.git]
/
cpu
/
mcf52x2
/
start.S
diff --git
a/cpu/mcf52x2/start.S
b/cpu/mcf52x2/start.S
index 8a83ca5ef7dd933b0ec0e8185892eabb86fcd558..7c9a7d2d2bd786939eb6b7db127e1481f54fd897 100644
(file)
--- a/
cpu/mcf52x2/start.S
+++ b/
cpu/mcf52x2/start.S
@@
-144,6
+144,7
@@
_start:
move.l #(CFG_INIT_RAM_ADDR + 0x21), %d0
movec %d0, %RAMBAR1
move.l #(CFG_INIT_RAM_ADDR + 0x21), %d0
movec %d0, %RAMBAR1
+#if defined(CONFIG_M5282)
#if (TEXT_BASE == CFG_INT_FLASH_BASE)
/* Setup code in SRAM to initialize FLASHBAR, if start from internal Flash */
#if (TEXT_BASE == CFG_INT_FLASH_BASE)
/* Setup code in SRAM to initialize FLASHBAR, if start from internal Flash */
@@
-170,6
+171,7
@@
_after_flashbar_copy:
movec %d0, %RAMBAR0
#endif /* (TEXT_BASE == CFG_INT_FLASH_BASE) */
movec %d0, %RAMBAR0
#endif /* (TEXT_BASE == CFG_INT_FLASH_BASE) */
+#endif
#endif
/* if we come from a pre-loader we have no exception table and
* therefore no VBR to set
#endif
/* if we come from a pre-loader we have no exception table and
* therefore no VBR to set