Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / include / asm-ppc / mmu.h

diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h
index 8f382fd6ff8a8936879f3031a7b5282926892a9b..ec22a5058e1c0b2b829284246c8cf7bcec374b76 100644 (file)
--- a/include/asm-ppc/mmu.h
+++ b/include/asm-ppc/mmu.h
@@ -485,19 +485,18 @@ extern unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg);
 extern void write_tlb(u32 _mas0, u32 _mas1, u32 _mas2, u32 _mas3, u32 _mas7);
 
 #define SET_TLB_ENTRY(_tlb, _epn, _rpn, _perms, _wimge, _ts, _esel, _sz, _iprot) \
-       { .tlb = _tlb, .epn = _epn, .rpn = _rpn, .perms = _perms, \
-         .wimge = _wimge, .ts = _ts, .esel = _esel, .tsize = _sz, .iprot = _iprot }
+       { .mas0 = FSL_BOOKE_MAS0(_tlb, _esel, 0), \
+         .mas1 = FSL_BOOKE_MAS1(1, _iprot, 0, _ts, _sz), \
+         .mas2 = FSL_BOOKE_MAS2(_epn, _wimge), \
+         .mas3 = FSL_BOOKE_MAS3(_rpn, 0, _perms), \
+         .mas7 = FSL_BOOKE_MAS7(_rpn), }
 
 struct fsl_e_tlb_entry {
-       u8      tlb;
-       u32     epn;
-       u64     rpn;
-       u8      perms;
-       u8      wimge;
-       u8      ts;
-       u8      esel;
-       u8      tsize;
-       u8      iprot;
+       u32     mas0;
+       u32     mas1;
+       u32     mas2;
+       u32     mas3;
+       u32     mas7;
 };
 
 extern struct fsl_e_tlb_entry tlb_table[];
@@ -505,13 +504,7 @@ extern int num_tlb_entries;
 #endif
 #endif
 
-#if defined(CONFIG_MPC86xx)
-#define LAWBAR_BASE_ADDR       0x00FFFFFF
-#define LAWAR_TRGT_IF          0x01F00000
-#else
-#define LAWBAR_BASE_ADDR       0x000FFFFF
-#define LAWAR_TRGT_IF          0x00F00000
-#endif
+#ifdef CONFIG_E300
 #define LAWAR_EN               0x80000000
 #define LAWAR_SIZE             0x0000003F
 
@@ -555,6 +548,7 @@ extern int num_tlb_entries;
 #define LAWAR_SIZE_8G          (LAWAR_SIZE_BASE+22)
 #define LAWAR_SIZE_16G         (LAWAR_SIZE_BASE+23)
 #define LAWAR_SIZE_32G         (LAWAR_SIZE_BASE+24)
+#endif
 
 #ifdef CONFIG_440
 /* General */