diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-11-02 15:09:22 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-11-02 15:09:22 +0100 |
| commit | e60adeac2d8fa30258e1706bb342a3363526e8d7 (patch) | |
| tree | 4be3ed35fbd50b56ac0cebecac2899d6527edbf0 /cpu/mcf52x2/start.S | |
| parent | d78791ae914d4e7c5edca1cdad73b3dc81a4eb82 (diff) | |
| parent | f0516920f6e048425b005c049378e80d600bd268 (diff) | |
| download | u-boot-imx-e60adeac2d8fa30258e1706bb342a3363526e8d7.zip u-boot-imx-e60adeac2d8fa30258e1706bb342a3363526e8d7.tar.gz u-boot-imx-e60adeac2d8fa30258e1706bb342a3363526e8d7.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/work
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 |