summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorTsiChungLiew <Tsi-Chung.Liew@freescale.com>2007-10-25 17:09:17 -0500
committerTsiChungLiew <Tsi-Chung.Liew@freescale.com>2007-10-25 17:09:17 -0500
commit2acefa72ee0026f862ab65597ca687428f63a973 (patch)
tree990725e4026e4bf3e3cfad72ee6a023b1b94e267 /cpu
parent5441f61a3d8b7034f19fc1361183e936198e6dbb (diff)
downloadu-boot-imx-2acefa72ee0026f862ab65597ca687428f63a973.zip
u-boot-imx-2acefa72ee0026f862ab65597ca687428f63a973.tar.gz
u-boot-imx-2acefa72ee0026f862ab65597ca687428f63a973.tar.bz2
ColdFire 5282: Fix external flash boot and return dramsize
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mcf52x2/start.S6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpu/mcf52x2/start.S b/cpu/mcf52x2/start.S
index 686e2a5..260a09a 100644
--- a/cpu/mcf52x2/start.S
+++ b/cpu/mcf52x2/start.S
@@ -58,7 +58,7 @@ _vectors:
.long 0x00000000 /* Flash offset is 0 until we setup CS0 */
#if defined(CONFIG_R5200)
.long 0x400
-#elif defined(CONFIG_M5282)
+#elif defined(CONFIG_M5282) && (TEXT_BASE == CFG_INT_FLASH_BASE)
.long _start - TEXT_BASE
#else
.long _START
@@ -177,7 +177,11 @@ _after_flashbar_copy:
* therefore no VBR to set
*/
#if !defined(CONFIG_MONITOR_IS_IN_RAM)
+#if defined(CONFIG_M5282) && (TEXT_BASE == CFG_INT_FLASH_BASE)
+ move.l #CFG_INT_FLASH_BASE, %d0
+#else
move.l #CFG_FLASH_BASE, %d0
+#endif
movec %d0, %VBR
#endif