diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-11-02 15:22:01 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-11-02 15:22:01 -0500 |
| commit | 3cac27c1d40b151f295dcfdb514fa928732e4ecf (patch) | |
| tree | 5dbc1813bfa548e8d31879c39c075bfdcbbf8f86 /cpu/mcf52x2 | |
| parent | 3c89d75409eb26639d36dfa11d4ee3d8b962dc3c (diff) | |
| parent | e60adeac2d8fa30258e1706bb342a3363526e8d7 (diff) | |
| download | talos-obmc-uboot-3cac27c1d40b151f295dcfdb514fa928732e4ecf.tar.gz talos-obmc-uboot-3cac27c1d40b151f295dcfdb514fa928732e4ecf.zip | |
Merge commit 'remotes/wd/master'
Diffstat (limited to 'cpu/mcf52x2')
| -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 686e2a5333..260a09abf7 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 |
