brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-11 13:46:17 +09:00
Code Issues Projects Releases Wiki Activity

powerpc: Remove warm reset entry point

Browse Source 
No boards utilize the warm reset entry point, so remove it.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
Peter Tyser 2010-09-14 19:13:53 -05:00 committed by Wolfgang Denk
parent 3792d7436e
commit 52ebd9c1e5
12 changed files with 25 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/powerpc/cpu/74xx_7xx/start.S
View File

@ -94,17 +94,7 @@ version_string:
. = EXC_OFF_SYS_RESET . = EXC_OFF_SYS_RESET
.globl _start .globl _start
_start: _start:
li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
b boot_cold 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 */ /* the boot code is located below the exception table */
@ -188,7 +178,6 @@ _end_of_vectors:
. = 0x2000 . = 0x2000
boot_cold: boot_cold:
boot_warm:
/* disable everything */ /* disable everything */
li r0, 0 li r0, 0
mtspr HID0, r0 mtspr HID0, r0
@ -288,14 +277,11 @@ in_flash:
bl cpu_init_f bl cpu_init_f
sync sync
mr r3, r21
/* r3: BOOTFLAG */
/* run 1st part of board init code (from Flash) */ /* run 1st part of board init code (from Flash) */
bl board_init_f bl board_init_f
sync sync
/* NOTREACHED */ /* NOTREACHED - board_init_f() does not return */
.globl invalidate_bats .globl invalidate_bats
invalidate_bats: invalidate_bats:

3
arch/powerpc/cpu/mpc512x/start.S
View File

@ -100,7 +100,6 @@ version_string:
.globl _start .globl _start
/* Start from here after reset/power on */ /* Start from here after reset/power on */
_start: _start:
li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
b boot_cold b boot_cold
.globl _start_of_vectors .globl _start_of_vectors
@ -260,8 +259,6 @@ in_flash:
/* run low-level CPU init code (in Flash) */ /* run low-level CPU init code (in Flash) */
bl cpu_init_f bl cpu_init_f
/* r3: BOOTFLAG */
mr r3, r21
/* run 1st part of board init code (in Flash) */ /* run 1st part of board init code (in Flash) */
bl board_init_f bl board_init_f

16
arch/powerpc/cpu/mpc5xx/start.S
View File

@ -91,18 +91,6 @@ _start:
li r4, CONFIG_SYS_ISB /* Set ISB bit */ li r4, CONFIG_SYS_ISB /* Set ISB bit */
or r3, r3, r4 or r3, r3, r4
mtspr 638, r3 mtspr 638, r3
li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
b boot_cold
. = EXC_OFF_SYS_RESET + 0x20
.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 */ /* Initialize machine status; enable machine check interrupt */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
@ -188,10 +176,10 @@ in_flash:
/* r3: IMMR */ /* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (from Flash) */ 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) */ bl board_init_f /* run 1st part of board init code (from Flash) */
/* NOTREACHED - board_init_f() does not return */
.globl _start_of_vectors .globl _start_of_vectors
_start_of_vectors: _start_of_vectors:

17
arch/powerpc/cpu/mpc5xxx/start.S
View File

@ -89,19 +89,6 @@ version_string:
. = EXC_OFF_SYS_RESET . = EXC_OFF_SYS_RESET
.globl _start .globl _start
_start: _start:
li r21, BOOTFLAG_COLD /* Normal Power-On */
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:
boot_warm:
mfmsr r5 /* save msr contents */ mfmsr r5 /* save msr contents */
/* Move CSBoot and adjust instruction pointer */ /* Move CSBoot and adjust instruction pointer */
@ -175,10 +162,10 @@ lowboot_reentry:
/* r3: IMMR */ /* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (in Flash)*/ bl cpu_init_f /* run low-level CPU init code (in Flash)*/
mr r3, r21
/* r3: BOOTFLAG */
bl board_init_f /* run 1st part of board init code (in Flash)*/ bl board_init_f /* run 1st part of board init code (in Flash)*/
/* NOTREACHED - board_init_f() does not return */
/* /*
* Vector Table * Vector Table
*/ */

17
arch/powerpc/cpu/mpc8220/start.S
View File

@ -88,19 +88,6 @@ version_string:
. = EXC_OFF_SYS_RESET . = EXC_OFF_SYS_RESET
.globl _start .globl _start
_start: _start:
li r21, BOOTFLAG_COLD /* Normal Power-On */
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:
boot_warm:
mfmsr r5 /* save msr contents */ mfmsr r5 /* save msr contents */
/* replace default MBAR base address from 0x80000000 /* replace default MBAR base address from 0x80000000
@ -144,10 +131,10 @@ boot_warm:
/* r3: IMMR */ /* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (in Flash)*/ bl cpu_init_f /* run low-level CPU init code (in Flash)*/
mr r3, r21
/* r3: BOOTFLAG */
bl board_init_f /* run 1st part of board init code (in Flash)*/ bl board_init_f /* run 1st part of board init code (in Flash)*/
/* NOTREACHED - board_init_f() does not return */
/* /*
* Vector Table * Vector Table
*/ */

17
arch/powerpc/cpu/mpc824x/start.S
View File

@ -97,19 +97,6 @@ version_string:
. = EXC_OFF_SYS_RESET . = EXC_OFF_SYS_RESET
.globl _start .globl _start
_start: _start:
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 */ /* Initialize machine status; enable machine check interrupt */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
li r3, MSR_KERNEL /* Set FP, ME, RI flags */ li r3, MSR_KERNEL /* Set FP, ME, RI flags */
@ -198,10 +185,10 @@ in_flash:
/* r3: IMMR */ /* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (from Flash) */ 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) */ bl board_init_f /* run 1st part of board init code (from Flash) */
/* NOTREACHED - board_init_f() does not return */
.globl _start_of_vectors .globl _start_of_vectors
_start_of_vectors: _start_of_vectors:

18
arch/powerpc/cpu/mpc8260/start.S
View File

@ -161,18 +161,6 @@ _hrcw_table:
.globl _start .globl _start
_start: _start:
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:
#if defined(CONFIG_MPC8260ADS) && defined(CONFIG_SYS_DEFAULT_IMMR) #if defined(CONFIG_MPC8260ADS) && defined(CONFIG_SYS_DEFAULT_IMMR)
lis r3, CONFIG_SYS_DEFAULT_IMMR@h lis r3, CONFIG_SYS_DEFAULT_IMMR@h
nop nop
@ -185,7 +173,7 @@ boot_cold:
stw r4, 0(r3) stw r4, 0(r3)
nop nop
#endif /* CONFIG_MPC8260ADS && CONFIG_SYS_DEFAULT_IMMR */ #endif /* CONFIG_MPC8260ADS && CONFIG_SYS_DEFAULT_IMMR */
boot_warm:
mfmsr r5 /* save msr contents */ mfmsr r5 /* save msr contents */
#if defined(CONFIG_COGENT) #if defined(CONFIG_COGENT)
@ -254,10 +242,10 @@ in_flash:
bl init_debug /* set up debugging stuff */ bl init_debug /* set up debugging stuff */
#endif #endif
mr r3, r21
/* r3: BOOTFLAG */
bl board_init_f /* run 1st part of board init code (in Flash)*/ bl board_init_f /* run 1st part of board init code (in Flash)*/
/* NOTREACHED - board_init_f() does not return */
/* /*
* Vector Table * Vector Table
*/ */

19
arch/powerpc/cpu/mpc83xx/start.S
View File

@ -183,22 +183,9 @@ ppcDWload:
.globl _start .globl _start
_start: /* time t 0 */ _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 lis r4, CONFIG_DEFAULT_IMMR@h
nop nop
boot_warm: /* time t 5 */
mfmsr r5 /* save msr contents */ mfmsr r5 /* save msr contents */
/* 83xx manuals prescribe a specific sequence for updating IMMRBAR. */ /* 83xx manuals prescribe a specific sequence for updating IMMRBAR. */
@ -302,11 +289,11 @@ in_flash:
/* run low-level CPU init code (in Flash)*/ /* run low-level CPU init code (in Flash)*/
bl cpu_init_f bl cpu_init_f
/* r3: BOOTFLAG */
mr r3, r21
/* run 1st part of board init code (in Flash)*/ /* run 1st part of board init code (in Flash)*/
bl board_init_f bl board_init_f
/* NOTREACHED - board_init_f() does not return */
#ifndef CONFIG_NAND_SPL #ifndef CONFIG_NAND_SPL
/* /*
* Vector Table * Vector Table

2
arch/powerpc/cpu/mpc85xx/start.S
View File

@ -432,6 +432,8 @@ _start_cont:
bl board_init_f bl board_init_f
isync isync
/* NOTREACHED - board_init_f() does not return */
#ifndef CONFIG_NAND_SPL #ifndef CONFIG_NAND_SPL
. = EXC_OFF_SYS_RESET . = EXC_OFF_SYS_RESET
.globl _start_of_vectors .globl _start_of_vectors

15
arch/powerpc/cpu/mpc86xx/start.S
View File

@ -83,17 +83,7 @@ version_string:
. = EXC_OFF_SYS_RESET . = EXC_OFF_SYS_RESET
.globl _start .globl _start
_start: _start:
li r21, BOOTFLAG_COLD /* Normal Power-On: Boot from FLASH */
b boot_cold 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 */ /* the boot code is located below the exception table */
@ -166,7 +156,6 @@ _end_of_vectors:
. = 0x2000 . = 0x2000
boot_cold: boot_cold:
boot_warm:
/* /*
* NOTE: Only Cpu 0 will ever come here. Other cores go to an * NOTE: Only Cpu 0 will ever come here. Other cores go to an
* address specified by the BPTR * address specified by the BPTR
@ -303,14 +292,12 @@ diag_done:
#endif #endif
/* bl l2cache_enable */ /* bl l2cache_enable */
mr r3, r21
/* r3: BOOTFLAG */
/* run 1st part of board init code (from Flash) */ /* run 1st part of board init code (from Flash) */
bl board_init_f bl board_init_f
sync sync
/* NOTREACHED */ /* NOTREACHED - board_init_f() does not return */
.globl invalidate_bats .globl invalidate_bats
invalidate_bats: invalidate_bats:

16
arch/powerpc/cpu/mpc8xx/start.S
View File

@ -96,18 +96,6 @@ version_string:
_start: _start:
lis r3, CONFIG_SYS_IMMR@h /* position IMMR */ lis r3, CONFIG_SYS_IMMR@h /* position IMMR */
mtspr 638, r3 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 */ /* Initialize machine status; enable machine check interrupt */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
@ -202,10 +190,10 @@ in_flash:
/* r3: IMMR */ /* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (from Flash) */ 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) */ bl board_init_f /* run 1st part of board init code (from Flash) */
/* NOTREACHED - board_init_f() does not return */
.globl _start_of_vectors .globl _start_of_vectors
_start_of_vectors: _start_of_vectors:

6
arch/powerpc/cpu/ppc4xx/start.S
View File

@ -261,6 +261,7 @@
GET_GOT GET_GOT
bl cpu_init_f /* run low-level CPU init code (from Flash) */ bl cpu_init_f /* run low-level CPU init code (from Flash) */
bl board_init_f bl board_init_f
/* NOTREACHED - board_init_f() does not return */
#endif #endif
#if defined(CONFIG_SYS_RAMBOOT) #if defined(CONFIG_SYS_RAMBOOT)
@ -803,6 +804,7 @@ _start:
bl cpu_init_f /* run low-level CPU init code (from Flash) */ bl cpu_init_f /* run low-level CPU init code (from Flash) */
bl board_init_f bl board_init_f
/* NOTREACHED - board_init_f() does not return */
#endif #endif
#endif /* CONFIG_440 */ #endif /* CONFIG_440 */
@ -911,6 +913,7 @@ _start:
GET_GOT /* initialize GOT access */ GET_GOT /* initialize GOT access */
bl board_init_f /* run first part of init code (from Flash) */ bl board_init_f /* run first part of init code (from Flash) */
/* NOTREACHED - board_init_f() does not return */
#endif /* CONFIG_IOP480 */ #endif /* CONFIG_IOP480 */
@ -1180,8 +1183,9 @@ _start:
bl cpu_init_f /* run low-level CPU init code (from Flash) */ bl cpu_init_f /* run low-level CPU init code (from Flash) */
/* NEVER RETURNS! */
bl board_init_f /* run first part of init code (from Flash) */ bl board_init_f /* run first part of init code (from Flash) */
/* NOTREACHED - board_init_f() does not return */
#endif /* CONFIG_NAND_SPL */ #endif /* CONFIG_NAND_SPL */
#endif /* CONFIG_405GP || CONFIG_405CR || CONFIG_405 || CONFIG_405EP */ #endif /* CONFIG_405GP || CONFIG_405CR || CONFIG_405 || CONFIG_405EP */