diff options
| author | Rafal Jaworowski <raj@semihalf.com> | 2007-07-19 17:12:28 +0200 |
|---|---|---|
| committer | Detlev Zundel <dzu@denx.de> | 2007-07-19 17:12:28 +0200 |
| commit | cc3023b9f95d7ac959a764471a65001062aecf41 (patch) | |
| tree | 83d1a1a42300337f78b3db4ee175b251153c20e0 | |
| parent | 3a6cab844cf74f76639d795e0be8717e02c86af7 (diff) | |
| download | u-boot-imx-cc3023b9f95d7ac959a764471a65001062aecf41.zip u-boot-imx-cc3023b9f95d7ac959a764471a65001062aecf41.tar.gz u-boot-imx-cc3023b9f95d7ac959a764471a65001062aecf41.tar.bz2 | |
Fix breakage of 8xx boards from recent commit.
This patch fixes the negative consequences for 8xx of the recent
"ppc4xx: Clean up 440 exceptions handling" commit.
Signed-off-by: Rafal Jaworowski <raj@semihalf.com>
| -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 9780fe1..4898dd4 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 9f4029f..ac8f317 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; \ |