V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[ppc] Fix build breakage for all non-4xx PowerPC variants. 

- adapt to the more generic EXCEPTION_PROLOG and CRIT_EXCEPTION macros
- minor 4xx cleanup
This commit is contained in:
Rafal Jaworowski 2007-06-22 14:58:04 +02:00
parent 83b4cfa3d6
commit 02032e8f14
23 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/74xx_7xx/start.S
View File

@ -125,7 +125,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = 0x600 . = 0x600
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -143,7 +143,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = 0x700 . = 0x700
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

4
cpu/mpc5xx/start.S
View File

@ -210,7 +210,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = 0x600 . = 0x600
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -228,7 +228,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = 0x700 . = 0x700
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

4
cpu/mpc5xxx/start.S
View File

@ -208,7 +208,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = 0x600 . = 0x600
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -227,7 +227,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = 0x700 . = 0x700
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

4
cpu/mpc8220/start.S
View File

@ -169,7 +169,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = 0x600 . = 0x600
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -188,7 +188,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = 0x700 . = 0x700
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

4
cpu/mpc824x/start.S
View File

@ -220,7 +220,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = EXC_OFF_ALIGN . = EXC_OFF_ALIGN
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -238,7 +238,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = EXC_OFF_PROGRAM . = EXC_OFF_PROGRAM
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

4
cpu/mpc8260/start.S
View File

@ -279,7 +279,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = 0x600 . = 0x600
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -298,7 +298,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = 0x700 . = 0x700
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

4
cpu/mpc83xx/start.S
View File

@ -263,7 +263,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = 0x600 . = 0x600
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -282,7 +282,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = 0x700 . = 0x700
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

4
cpu/mpc85xx/start.S
View File

@ -457,7 +457,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = 0x0600 . = 0x0600
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -475,7 +475,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = 0x0700 . = 0x0700
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

4
cpu/mpc86xx/start.S
View File

@ -116,7 +116,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = 0x600 . = 0x600
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -134,7 +134,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = 0x700 . = 0x700
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

4
cpu/mpc8xx/start.S
View File

@ -224,7 +224,7 @@ _start_of_vectors:
/* Alignment exception. */ /* Alignment exception. */
. = 0x600 . = 0x600
Alignment: Alignment:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
mfspr r4,DAR mfspr r4,DAR
stw r4,_DAR(r21) stw r4,_DAR(r21)
mfspr r5,DSISR mfspr r5,DSISR
@ -242,7 +242,7 @@ Alignment:
/* Program check exception */ /* Program check exception */
. = 0x700 . = 0x700
ProgramCheck: ProgramCheck:
EXCEPTION_PROLOG EXCEPTION_PROLOG(SRR0, SRR1)
addi r3,r1,STACK_FRAME_OVERHEAD addi r3,r1,STACK_FRAME_OVERHEAD
li r20,MSR_KERNEL li r20,MSR_KERNEL
rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */ rlwimi r20,r23,0,16,16 /* copy EE bit from saved MSR */

1
cpu/ppc4xx/start.S
View File

@ -60,7 +60,6 @@
* address and (s)dram will be positioned at address 0 * address and (s)dram will be positioned at address 0
*/ */
#include <config.h> #include <config.h>
#include <mpc8xx.h>
#include <ppc4xx.h> #include <ppc4xx.h>
#include <version.h> #include <version.h>

1
include/74xx_7xx.h
View File

@ -34,6 +34,7 @@
* Exception offsets (PowerPC standard) * Exception offsets (PowerPC standard)
*/ */
#define EXC_OFF_SYS_RESET 0x0100 /* default system reset offset */ #define EXC_OFF_SYS_RESET 0x0100 /* default system reset offset */
#define _START_OFFSET EXC_OFF_SYS_RESET
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* l2cr values * l2cr values

1
include/mpc5xx.h
View File

@ -36,6 +36,7 @@
* Exception offsets (PowerPC standard) * Exception offsets (PowerPC standard)
*/ */
#define EXC_OFF_SYS_RESET 0x0100 /* System reset */ #define EXC_OFF_SYS_RESET 0x0100 /* System reset */
#define _START_OFFSET EXC_OFF_SYS_RESET
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* ISB bit in IMMR to set internal memory map * ISB bit in IMMR to set internal memory map

1
include/mpc5xxx.h
View File

@ -39,6 +39,7 @@
/* Exception offsets (PowerPC standard) */ /* Exception offsets (PowerPC standard) */
#define EXC_OFF_SYS_RESET 0x0100 #define EXC_OFF_SYS_RESET 0x0100
#define _START_OFFSET EXC_OFF_SYS_RESET
/* useful macros for manipulating CSx_START/STOP */ /* useful macros for manipulating CSx_START/STOP */
#if defined(CONFIG_MGT5100) #if defined(CONFIG_MGT5100)

1
include/mpc8220.h
View File

@ -35,6 +35,7 @@
/* Exception offsets (PowerPC standard) */ /* Exception offsets (PowerPC standard) */
#define EXC_OFF_SYS_RESET 0x0100 #define EXC_OFF_SYS_RESET 0x0100
#define _START_OFFSET EXC_OFF_SYS_RESET
/* Internal memory map */ /* Internal memory map */
/* MPC8220 Internal Register MMAP */ /* MPC8220 Internal Register MMAP */

2
include/mpc824x.h
View File

@ -142,6 +142,8 @@
#define EXC_OFF_JMDDI 0x1600 /* Java Mode denorm detect Interr -- WTF??*/ #define EXC_OFF_JMDDI 0x1600 /* Java Mode denorm detect Interr -- WTF??*/
#define EXC_OFF_RMTE 0x2000 /* Run Mode or Trace Exception */ #define EXC_OFF_RMTE 0x2000 /* Run Mode or Trace Exception */
#define _START_OFFSET EXC_OFF_SYS_RESET
#define MAP_A_CONFIG_ADDR_HIGH 0x8000 /* Upper half of CONFIG_ADDR for Map A */ #define MAP_A_CONFIG_ADDR_HIGH 0x8000 /* Upper half of CONFIG_ADDR for Map A */
#define MAP_A_CONFIG_ADDR_LOW 0x0CF8 /* Lower half of CONFIG_ADDR for Map A */ #define MAP_A_CONFIG_ADDR_LOW 0x0CF8 /* Lower half of CONFIG_ADDR for Map A */
#define MAP_A_CONFIG_DATA_HIGH 0x8000 /* Upper half of CONFIG_DAT for Map A */ #define MAP_A_CONFIG_DATA_HIGH 0x8000 /* Upper half of CONFIG_DAT for Map A */

2
include/mpc8260.h
View File

@ -53,7 +53,7 @@
* Exception offsets (PowerPC standard) * Exception offsets (PowerPC standard)
*/ */
#define EXC_OFF_SYS_RESET 0x0100 /* System reset */ #define EXC_OFF_SYS_RESET 0x0100 /* System reset */
#define _START_OFFSET EXC_OFF_SYS_RESET
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* BCR - Bus Configuration Register 4-25 * BCR - Bus Configuration Register 4-25

1
include/mpc83xx.h
View File

@ -25,6 +25,7 @@
/* System reset offset (PowerPC standard) /* System reset offset (PowerPC standard)
*/ */
#define EXC_OFF_SYS_RESET 0x0100 #define EXC_OFF_SYS_RESET 0x0100
#define _START_OFFSET EXC_OFF_SYS_RESET
/* IMMRBAR - Internal Memory Register Base Address /* IMMRBAR - Internal Memory Register Base Address
*/ */

1
include/mpc85xx.h
View File

@ -8,6 +8,7 @@
#define __MPC85xx_H__ #define __MPC85xx_H__
#define EXC_OFF_SYS_RESET 0x0100 /* System reset */ #define EXC_OFF_SYS_RESET 0x0100 /* System reset */
#define _START_OFFSET EXC_OFF_SYS_RESET
#if defined(CONFIG_E500) #if defined(CONFIG_E500)
#include <e500.h> #include <e500.h>

2
include/mpc86xx.h
View File

@ -8,7 +8,7 @@
#define __MPC86xx_H__ #define __MPC86xx_H__
#define EXC_OFF_SYS_RESET 0x0100 /* System reset offset */ #define EXC_OFF_SYS_RESET 0x0100 /* System reset offset */
#define _START_OFFSET EXC_OFF_SYS_RESET
/* /*
* platform register addresses * platform register addresses

2
include/mpc8xx.h
View File

@ -35,7 +35,7 @@
* Exception offsets (PowerPC standard) * Exception offsets (PowerPC standard)
*/ */
#define EXC_OFF_SYS_RESET 0x0100 /* System reset */ #define EXC_OFF_SYS_RESET 0x0100 /* System reset */
#define _START_OFFSET EXC_OFF_SYS_RESET
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* SYPCR - System Protection Control Register 11-9 * SYPCR - System Protection Control Register 11-9

3
include/ppc4xx.h
View File

@ -22,7 +22,8 @@
#ifndef __PPC4XX_H__ #ifndef __PPC4XX_H__
#define __PPC4XX_H__ #define __PPC4XX_H__
#define _START_OFFSET 0x2100 #define EXC_OFF_SYS_RESET 0x0100 /* System reset */
#define _START_OFFSET (EXC_OFF_SYS_RESET + 0x2000)
#if defined(CONFIG_440) #if defined(CONFIG_440)
#include <ppc440.h> #include <ppc440.h>

2
include/ppc_asm.tmpl
View File

@ -274,7 +274,7 @@ label: \
#define CRIT_EXCEPTION(n, label, hdlr) \ #define CRIT_EXCEPTION(n, label, hdlr) \
. = n; \ . = n; \
label: \ label: \
EXCEPTION_PROLOG(csrr0, csrr1); \ EXCEPTION_PROLOG(CSRR0, CSRR1); \
lwz r3,GOT(transfer_to_handler); \ lwz r3,GOT(transfer_to_handler); \
mtlr r3; \ mtlr r3; \
addi r3,r1,STACK_FRAME_OVERHEAD; \ addi r3,r1,STACK_FRAME_OVERHEAD; \