diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2010-09-14 19:13:53 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-12 23:01:32 +0200 |
| commit | 52ebd9c1e5db30c0392c0c6761c98252918dd624 (patch) | |
| tree | 1c0a6eb7b95ab268b7249bc38601ed0f13acec7a /arch/powerpc/cpu/mpc83xx | |
| parent | 3792d7436e2bf881b6abdede5a481a62b5dedd55 (diff) | |
| download | u-boot-imx-52ebd9c1e5db30c0392c0c6761c98252918dd624.zip u-boot-imx-52ebd9c1e5db30c0392c0c6761c98252918dd624.tar.gz u-boot-imx-52ebd9c1e5db30c0392c0c6761c98252918dd624.tar.bz2 | |
powerpc: Remove warm reset entry point
No boards utilize the warm reset entry point, so remove it.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc83xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/start.S | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index c7d85a8..bdce915 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -183,22 +183,9 @@ ppcDWload: .globl _start _start: /* time t 0 */ - li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH*/ - nop - b boot_cold - - . = EXC_OFF_SYS_RESET + 0x10 - - .globl _start_warm -_start_warm: - li r21, BOOTFLAG_WARM /* Software reboot */ - b boot_warm - - -boot_cold: /* time t 3 */ lis r4, CONFIG_DEFAULT_IMMR@h nop -boot_warm: /* time t 5 */ + mfmsr r5 /* save msr contents */ /* 83xx manuals prescribe a specific sequence for updating IMMRBAR. */ @@ -302,11 +289,11 @@ in_flash: /* run low-level CPU init code (in Flash)*/ bl cpu_init_f - /* r3: BOOTFLAG */ - mr r3, r21 /* run 1st part of board init code (in Flash)*/ bl board_init_f + /* NOTREACHED - board_init_f() does not return */ + #ifndef CONFIG_NAND_SPL /* * Vector Table |