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

diff --cc arch/powerpc/cpu/mpc85xx/cmd_errata.c
Simple merge

diff --cc arch/powerpc/cpu/ppc4xx/cpu.c
Simple merge

diff --cc arch/powerpc/include/asm/config_mpc85xx.h
index cf1bb02,d748cb6..15e44de
--- 1/arch/powerpc/include/asm/config_mpc85xx.h
--- 2/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@@ -133,9 -131,8 +133,10 @@@
  #define CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
  #define CONFIG_SYS_FSL_ERRATUM_IFC_A002769
  #define CONFIG_SYS_FSL_ERRATUM_P1010_A003549
+ #define CONFIG_SYS_FSL_ERRATUM_SEC_A003571
  #define CONFIG_SYS_FSL_ERRATUM_IFC_A003399
 +#define CONFIG_SYS_FSL_ERRATUM_I2C_A004447
 +#define CONFIG_SYS_FSL_A004447_SVR_REV        0x10
  
  /* P1011 is single core version of P1020 */
  #elif defined(CONFIG_P1011)