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

diff --combined include/common.h
index 0d40fab0410a1d075c65a3c052b8bc7658a2b584,4d2a56d0dea327cffd5f805d84132a655a7c760d..f1a590a15ef2fd1ec8aadb8ec95d8c0fe7feaee6
--- 1/include/common.h
--- 2/include/common.h
+++ b/include/common.h
@@@ -383,7 -383,7 +383,7 @@@ int setenv_hex(const char *varname, ulo
  /**
   * setenv_addr - Set an environment variable to an address in hex
   *
 - * @varname:  Environmet variable to set
 + * @varname:  Environment variable to set
   * @addr:     Value to set it to
   * @return 0 if ok, 1 on error
   */
@@@ -627,6 -627,8 +627,8 @@@ void ft_pci_setup(void *blob, bd_t *bd)
  #endif
  #endif
  
+ void smp_set_core_boot_addr(unsigned long addr, int corenr);
+ void smp_kick_all_cpus(void);
  
  /* $(CPU)/serial.c */
  int   serial_init   (void);
@@@ -1015,10 -1017,10 +1017,10 @@@ 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 PAD_COUNT(s, pad) ((s - 1) / pad + 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)  \
 +      char __##name[ROUND(PAD_SIZE((size) * sizeof(type), pad), align)  \
                      + (align - 1)];                                   \
                                                                        \
        type *name = (type *) ALIGN((uintptr_t)__##name, align)