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

diff --combined arch/powerpc/include/asm/mmu.h
index ce7f0810051d67daea5b2a26eeba282c34b71f59,5166507f9230fa4ab33046aae4a893e0dc765951..5166507f9230fa4ab33046aae4a893e0dc765951
--- 1/arch/powerpc/include/asm/mmu.h
--- 2/arch/ppc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@@ -577,11 -577,16 +577,16 @@@ extern int num_tlb_entries
  #define SA_M  0x00000200      /* Memory coherence */
  #define SA_G  0x00000100      /* Guarded */
  #define SA_E  0x00000080      /* Endian */
+ /* Some additional macros for combinations often used */
+ #define SA_IG (SA_I | SA_G)
  
  /* Access control */
  #define AC_X  0x00000024      /* Execute */
  #define AC_W  0x00000012      /* Write */
  #define AC_R  0x00000009      /* Read */
+ /* Some additional macros for combinations often used */
+ #define AC_RW (AC_R | AC_W)
+ #define AC_RWX        (AC_R | AC_W | AC_X)
  
  /* Some handy macros */