diff options
| author | Stefan Roese <sr@denx.de> | 2007-11-13 08:16:40 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-11-13 08:16:40 +0100 |
| commit | 5c568d6a7f950b9e7e32a63a5893f979b8789b4d (patch) | |
| tree | 44ed0fdc0548facecfa35e8d6eedf0616c3ca269 /cpu/mcf52x2/start.S | |
| parent | 49801028715cd8bc22863cdfc0ee7919b7a6af4b (diff) | |
| parent | 992742a5b09d9040adbd156fb90756af66ade310 (diff) | |
| download | u-boot-imx-5c568d6a7f950b9e7e32a63a5893f979b8789b4d.zip u-boot-imx-5c568d6a7f950b9e7e32a63a5893f979b8789b4d.tar.gz u-boot-imx-5c568d6a7f950b9e7e32a63a5893f979b8789b4d.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'cpu/mcf52x2/start.S')
| -rw-r--r-- | cpu/mcf52x2/start.S | 6 |
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 |