summaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu/mpc8xx
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/mpc8xx
parent3792d7436e2bf881b6abdede5a481a62b5dedd55 (diff)
downloadu-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/mpc8xx')
-rw-r--r--arch/powerpc/cpu/mpc8xx/start.S16
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/start.S b/arch/powerpc/cpu/mpc8xx/start.S
index 7cf602f..d6100ec 100644
--- a/arch/powerpc/cpu/mpc8xx/start.S
+++ b/arch/powerpc/cpu/mpc8xx/start.S
@@ -96,18 +96,6 @@ version_string:
_start:
lis r3, CONFIG_SYS_IMMR@h /* position IMMR */
mtspr 638, r3
- li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
- b boot_cold
-
- . = EXC_OFF_SYS_RESET + 0x10
-
- .globl _start_warm
-_start_warm:
- li r21, BOOTFLAG_WARM /* Software reboot */
- b boot_warm
-
-boot_cold:
-boot_warm:
/* Initialize machine status; enable machine check interrupt */
/*----------------------------------------------------------------------*/
@@ -202,10 +190,10 @@ in_flash:
/* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (from Flash) */
- mr r3, r21
- /* r3: BOOTFLAG */
bl board_init_f /* run 1st part of board init code (from Flash) */
+ /* NOTREACHED - board_init_f() does not return */
+
.globl _start_of_vectors
_start_of_vectors: