projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
immap_85xx.h
diff --git
a/arch/powerpc/include/asm/immap_85xx.h
b/arch/powerpc/include/asm/immap_85xx.h
index 88c1e08df5ecf904220116af1e37bd273b72c8ff..0264523d6402779e094ed5fee993f9fddcc95be0 100644
(file)
--- a/
arch/powerpc/include/asm/immap_85xx.h
+++ b/
arch/powerpc/include/asm/immap_85xx.h
@@
-1912,6
+1912,7
@@
defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
u8 res24[64];
u32 pblsr; /* Preboot loader status */
u32 pamubypenr; /* PAMU bypass enable */
u8 res24[64];
u32 pblsr; /* Preboot loader status */
u32 pamubypenr; /* PAMU bypass enable */
+#define FSL_CORENET_PAMU_BYPASS 0xffff0000
u32 dmacr1; /* DMA control */
u8 res25[4];
u32 gensr1; /* General status */
u32 dmacr1; /* DMA control */
u8 res25[4];
u32 gensr1; /* General status */