aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu/mpc86xx/start.S
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2010-09-14 19:13:53 -0500
committerWolfgang Denk <wd@denx.de>2010-10-12 23:01:32 +0200
commit52ebd9c1e5db30c0392c0c6761c98252918dd624 (patch)
tree1c0a6eb7b95ab268b7249bc38601ed0f13acec7a /arch/powerpc/cpu/mpc86xx/start.S
parent3792d7436e2bf881b6abdede5a481a62b5dedd55 (diff)
downloadu-boot-linaro-stable-52ebd9c1e5db30c0392c0c6761c98252918dd624.tar.gz
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/mpc86xx/start.S')
-rw-r--r--arch/powerpc/cpu/mpc86xx/start.S15
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S
index ed1e4ca66..596053f88 100644
--- a/arch/powerpc/cpu/mpc86xx/start.S
+++ b/arch/powerpc/cpu/mpc86xx/start.S
@@ -83,17 +83,7 @@ version_string:
. = EXC_OFF_SYS_RESET
.globl _start
_start:
- li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
b boot_cold
- sync
-
- . = EXC_OFF_SYS_RESET + 0x10
-
- .globl _start_warm
-_start_warm:
- li r21, BOOTFLAG_WARM /* Software reboot */
- b boot_warm
- sync
/* the boot code is located below the exception table */
@@ -166,7 +156,6 @@ _end_of_vectors:
. = 0x2000
boot_cold:
-boot_warm:
/*
* NOTE: Only Cpu 0 will ever come here. Other cores go to an
* address specified by the BPTR
@@ -303,14 +292,12 @@ diag_done:
#endif
/* bl l2cache_enable */
- mr r3, r21
- /* r3: BOOTFLAG */
/* run 1st part of board init code (from Flash) */
bl board_init_f
sync
- /* NOTREACHED */
+ /* NOTREACHED - board_init_f() does not return */
.globl invalidate_bats
invalidate_bats: