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

diff --combined include/common.h
index fd2495f0d8df34676e0476e25636dd30dec66347,de75da29cafa3e3415c99ce92b4a09e2ce57e3e9..8a1f3e406d9f529fb04c9c9e50bd58e1f22b9e3e
--- 1/include/common.h
--- 2/include/common.h
+++ b/include/common.h
@@@ -648,9 -648,6 +648,6 @@@ int        prt_8260_clks (void)
  #elif defined(CONFIG_MPC5xxx)
  int   prt_mpc5xxx_clks (void);
  #endif
- #if defined(CONFIG_MPC512X)
- int   prt_mpc512xxx_clks (void);
- #endif
  #if defined(CONFIG_MPC8220)
  int   prt_mpc8220_clks (void);
  #endif
@@@ -1011,17 -1008,10 +1008,17 @@@ static inline phys_addr_t map_to_sysmem
   * of a function scoped static buffer.  It can not be used to create a cache
   * line aligned global buffer.
   */
 -#define ALLOC_ALIGN_BUFFER(type, name, size, align)                   \
 -      char __##name[ROUND(size * sizeof(type), align) + (align - 1)]; \
 +#define PAD_COUNT(s, pad) ((s - 1) / pad + 1)
 +#define PAD_SIZE(s, pad) (PAD_COUNT(s, pad) * pad)
 +#define ALLOC_ALIGN_BUFFER_PAD(type, name, size, align, pad)          \
 +      char __##name[ROUND(PAD_SIZE(size * sizeof(type), pad), align)  \
 +                    + (align - 1)];                                   \
                                                                        \
        type *name = (type *) ALIGN((uintptr_t)__##name, align)
 +#define ALLOC_ALIGN_BUFFER(type, name, size, align)           \
 +      ALLOC_ALIGN_BUFFER_PAD(type, name, size, align, 1)
 +#define ALLOC_CACHE_ALIGN_BUFFER_PAD(type, name, size, pad)           \
 +      ALLOC_ALIGN_BUFFER_PAD(type, name, size, ARCH_DMA_MINALIGN, pad)
  #define ALLOC_CACHE_ALIGN_BUFFER(type, name, size)                    \
        ALLOC_ALIGN_BUFFER(type, name, size, ARCH_DMA_MINALIGN)
  
@@@ -1032,7 -1022,7 +1029,7 @@@
   */
  #define DEFINE_ALIGN_BUFFER(type, name, size, align)                  \
        static char __##name[roundup(size * sizeof(type), align)]       \
 -                      __attribute__((aligned(align)));                                \
 +                      __aligned(align);                               \
                                                                        \
        static type *name = (type *)__##name
  #define DEFINE_CACHE_ALIGN_BUFFER(type, name, size)                   \