diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-02 08:43:48 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-02 08:43:48 +0200 |
| commit | b5dc4403f6351133c92faea8f6ea3037cbd48f2c (patch) | |
| tree | 46724d43237eb9e8cad284831ad18ac1e13d908f | |
| parent | 9ca8d79de096c65b9b9c867259b3ff4685f775ef (diff) | |
| parent | cc3023b9f95d7ac959a764471a65001062aecf41 (diff) | |
Merge with git://www.denx.de/git/u-boot.git
| -rw-r--r-- | include/asm-ppc/processor.h | 6 | ||||
| -rw-r--r-- | include/ppc_asm.tmpl | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 9780fe15c..4898dd41c 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -628,6 +628,12 @@ #define MAS6 SPRN_MAS6 #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 */ #define DCRN_BEAR 0x090 /* Bus Error Address Register */ diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl index 9f4029f2a..ac8f31768 100644 --- a/include/ppc_asm.tmpl +++ b/include/ppc_asm.tmpl @@ -235,7 +235,7 @@ stw r22,_CTR(r21); \ mfspr r20,XER; \ stw r20,_XER(r21); \ - mfspr r20,DEAR; \ + mfspr r20, DAR_DEAR; \ stw r20,_DAR(r21); \ mfspr r22,reg1; \ mfspr r23,reg2; \ |