diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-08-05 16:46:23 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-08-05 16:46:23 +0200 |
| commit | 45b3fd28152ed8c52f2dad06a422ac6e95cd48fd (patch) | |
| tree | acfdf13b17246d2225db904112345ab1db2099cc /include/asm-ppc/processor.h | |
| parent | af8377d4eb3a0ac5a831830d5ce63fbf65fecb7f (diff) | |
| parent | b1b54e352028ed370c3aa95d6fdeb9d64c5d2f86 (diff) | |
| download | olio-uboot-2014.01-45b3fd28152ed8c52f2dad06a422ac6e95cd48fd.tar.xz olio-uboot-2014.01-45b3fd28152ed8c52f2dad06a422ac6e95cd48fd.zip | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'include/asm-ppc/processor.h')
| -rw-r--r-- | include/asm-ppc/processor.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 9780fe15c..71e2e847a 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -58,7 +58,6 @@ #else #define MSR_KERNEL MSR_ME #endif -#define MSR_USER MSR_KERNEL|MSR_PR|MSR_EE /* Floating Point Status and Control Register (FPSCR) Fields */ @@ -628,6 +627,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 */ |