From: Tom Rini <trini@ti.com>
Date: Wed, 21 Aug 2013 20:27:47 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
X-Git-Tag: v2013.10-rc2~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6612ab33956ae09c5ba2fde9c1540b519625ba37;p=u-boot

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

6612ab33956ae09c5ba2fde9c1540b519625ba37
diff --cc arch/powerpc/cpu/mpc85xx/cmd_errata.c
index 05436f9947,8a2a3ee76c..eea264b151
--- a/arch/powerpc/cpu/mpc85xx/cmd_errata.c
+++ b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
@@@ -245,13 -245,12 +245,17 @@@ static int do_errata(cmd_tbl_t *cmdtp, 
  #ifdef CONFIG_SYS_FSL_ERRATUM_A006593
  	puts("Work-around for Erratum A006593 enabled\n");
  #endif
+ #ifdef CONFIG_SYS_FSL_ERRATUM_SEC_A003571
+ 	if (IS_SVR_REV(svr, 1, 0))
+ 		puts("Work-around for Erratum A003571 enabled\n");
+ #endif
  #ifdef CONFIG_SYS_FSL_ERRATUM_A005812
  	puts("Work-around for Erratum A-005812 enabled\n");
 +#endif
 +#ifdef CONFIG_SYS_FSL_ERRATUM_I2C_A004447
 +	if ((SVR_SOC_VER(svr) == SVR_8548 && IS_SVR_REV(svr, 3, 1)) ||
 +	    (SVR_REV(svr) <= CONFIG_SYS_FSL_A004447_SVR_REV))
 +		puts("Work-around for Erratum I2C-A004447 enabled\n");
  #endif
  	return 0;
  }
diff --cc arch/powerpc/include/asm/config_mpc85xx.h
index cf1bb02797,d748cb62d4..15e44de41e
--- a/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)