MLK-10576 ARM: i.MX6: exclude the ARM errata from i.MX6 UP system

The ARM errata 751472, 794072, 761320, 845369 only applied
to the following configuration:

This erratum affects configurations with either:
- One processor if the ACP is present
- Two or more processors

i.MX6 family does not have the ACP and thus only the MPCore system
will be impacted, which are the i.MX6DQ, i.MX6DL, and i.MX6QP.

Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
Signed-off-by: Jason Liu <r64343@freescale.com>
(cherry picked from commit 0db960784ba4f631ee5c0321b5d25f3b1ac55640)
(cherry picked from commit 850f27d137a083a141c99fe9828d596807937d38)

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index bbd560f..b679d0f 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -3,11 +3,6 @@ if ARCH_MX6
 config MX6
        bool
        default y
-       select ARM_ERRATA_743622 if !MX6UL
-       select ARM_ERRATA_751472 if !MX6UL
-       select ARM_ERRATA_761320 if !MX6UL
-       select ARM_ERRATA_794072 if !MX6UL
-       select ARM_ERRATA_845369 if !MX6UL
 
 config MX6D
        bool

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 20953d1..c23da27 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -8,6 +8,15 @@
 #define __MX6_COMMON_H
 
 #ifndef CONFIG_MX6UL
+#define CONFIG_ARM_ERRATA_743622
+#if (defined(CONFIG_MX6QP) || defined(CONFIG_MX6Q) ||\
+defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6SOLO)
+#define CONFIG_ARM_ERRATA_751472
+#define CONFIG_ARM_ERRATA_794072
+#define CONFIG_ARM_ERRATA_761320
+#define CONFIG_ARM_ERRATA_845369
+#endif
+
 #ifndef CONFIG_SYS_L2CACHE_OFF
 #define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE  L2_PL310_BASE