diff options
author | wdenk <wdenk> | 2004-01-02 14:00:00 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2004-01-02 14:00:00 +0000 |
commit | d4ca31c40e8888b36635967522ec7ea03fd7e70b (patch) | |
tree | 126385a917df4665532dc33cff5fee2977e8fc0e /cpu/mpc5xxx/start.S | |
parent | c18960049f8ea9b0a8ad0a05c93e23fbab025da0 (diff) | |
download | u-boot-imx-d4ca31c40e8888b36635967522ec7ea03fd7e70b.zip u-boot-imx-d4ca31c40e8888b36635967522ec7ea03fd7e70b.tar.gz u-boot-imx-d4ca31c40e8888b36635967522ec7ea03fd7e70b.tar.bz2 |
* Cleanup lowboot code for MPC5200
* Minor code cleanup (coding style)
* Patch by Reinhard Meyer, 30 Dec 2003:
- cpu/mpc5xxx/fec.c: added CONFIG_PHY_ADDR, added CONFIG_PHY_TYPE,
- added CONFIG_PHY_ADDR to include/configs/IceCube.h,
- turned debug print of PHY registers into a function (called in two places)
- added support for EMK MPC5200 based modules
* Fix MPC8xx PLPRCR_MFD_SHIFT typo
* Add support for TQM866M modules
* Fixes for TQM855M with 4 MB flash (Am29DL163 = _no_ mirror bit flash)
* Fix a few compiler warnings
Diffstat (limited to 'cpu/mpc5xxx/start.S')
-rw-r--r-- | cpu/mpc5xxx/start.S | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/cpu/mpc5xxx/start.S b/cpu/mpc5xxx/start.S index e0873ed..a001e1c 100644 --- a/cpu/mpc5xxx/start.S +++ b/cpu/mpc5xxx/start.S @@ -118,18 +118,12 @@ boot_warm: ori r3, r3, 0x02010000@l stw r3, 0x54(r4) -#if defined(CFG_LOWBOOT08) - lis r3, 0xff800160@h - ori r3, r3, 0xff800160@l -#endif -#if defined(CFG_LOWBOOT16) - lis r3, 0xff000160@h - ori r3, r3, 0xff000160@l -#endif + lis r3, lowboot_reentry@h + ori r3, r3, lowboot_reentry@l mtlr r3 - blr -lowboot_reentry: /* FLASH_BASE + 0x160 */ - + blr /* jump to flash based address */ + +lowboot_reentry: lis r3, 0x0000FF00@h ori r3, r3, 0x0000FF00@l stw r3, 0x4c(r4) @@ -143,7 +137,7 @@ lowboot_reentry: /* FLASH_BASE + 0x160 */ ori r3, r3, 0x02000001@l stw r3, 0x54(r4) #endif /* CFG_LOWBOOT */ - + #if defined(CFG_DEFAULT_MBAR) && !defined(CFG_RAMBOOT) lis r3, CFG_MBAR@h ori r3, r3, CFG_MBAR@l |