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

Merge with git://www.denx.de/git/u-boot.git

This commit is contained in:
Stefan Roese 2007-08-02 08:43:48 +02:00
parent 9ca8d79de0 cc3023b9f9
commit b5dc4403f6
2 changed files with 7 additions and 1 deletions

6
include/asm-ppc/processor.h
View File

@ -628,6 +628,12 @@
#define MAS6 SPRN_MAS6 #define MAS6 SPRN_MAS6
#define MAS7 SPRN_MAS7 #define MAS7 SPRN_MAS7
#if defined(CONFIG_4xx) || defined(CONFIG_44x) || defined(CONFIG_MPC85xx)
#define DAR_DEAR DEAR
#else
#define DAR_DEAR DAR
#endif
/* Device Control Registers */ /* Device Control Registers */
#define DCRN_BEAR 0x090 /* Bus Error Address Register */ #define DCRN_BEAR 0x090 /* Bus Error Address Register */

2
include/ppc_asm.tmpl
View File

@ -235,7 +235,7 @@
stw r22,_CTR(r21); \ stw r22,_CTR(r21); \
mfspr r20,XER; \ mfspr r20,XER; \
stw r20,_XER(r21); \ stw r20,_XER(r21); \
mfspr r20,DEAR; \ mfspr r20, DAR_DEAR; \
stw r20,_DAR(r21); \ stw r20,_DAR(r21); \
mfspr r22,reg1; \ mfspr r22,reg1; \
mfspr r23,reg2; \ mfspr r23,reg2; \