[PATCH 2/2] ARM: disable errata work-arounds which access secure registers

[Fabio Estevam]

On Fri, Jan 4, 2013 at 7:29 PM, Fabio Estevam <festevam at gmail.com> wrote:
> On Wed, Dec 12, 2012 at 8:25 PM, Rob Herring <robherring2 at gmail.com> wrote:
>> From: Rob Herring <rob.herring at calxeda.com>
>>
>> In order to support secure and non-secure platforms in multi-platform
>> kernels, errata work-arounds that access secure only registers need to
>> be disabled. Make all the errata options that fit in this category
>> depend on !CONFIG_ARCH_MULTIPLATFORM.
>>
>> This will effectively remove the errata options as platforms are
>> converted over to multi-platform.
>>
>> Signed-off-by: Rob Herring <rob.herring at calxeda.com>
>
> With this patch applied I get:
>
> $ make imx_v6_v7_defconfig
> warning: (SOC_IMX6Q && ARCH_TEGRA_2x_SOC && ARCH_TEGRA_3x_SOC) selects
> ARM_ERRATA_751472 which has unmet direct dependencies (CPU_V7 &&
> !ARCH_MULTIPLATFORM)
> warning: (SOC_IMX6Q && ARCH_TEGRA_3x_SOC) selects ARM_ERRATA_743622
> which has unmet direct dependencies (CPU_V7 && !ARCH_MULTIPLATFORM)
> warning: (SOC_IMX6Q && ARCH_TEGRA_3x_SOC) selects ARM_ERRATA_743622
> which has unmet direct dependencies (CPU_V7 && !ARCH_MULTIPLATFORM)
> warning: (SOC_IMX6Q && ARCH_TEGRA_2x_SOC && ARCH_TEGRA_3x_SOC) selects
> ARM_ERRATA_751472 which has unmet direct dependencies (CPU_V7 &&
> !ARCH_MULTIPLATFORM)
> #
> # configuration written to .config
> #
>
> Any suggestion?

Should we do like this?

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 1ad0d76..b11bba8 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -841,9 +841,9 @@ config SOC_IMX6Q
        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARM_CPU_SUSPEND if PM
-       select ARM_ERRATA_743622
-       select ARM_ERRATA_751472
-       select ARM_ERRATA_754322
+       select ARM_ERRATA_743622 if !ARCH_MULTIPLATFORM
+       select ARM_ERRATA_751472 if !ARCH_MULTIPLATFORM
+       select ARM_ERRATA_754322
        select ARM_ERRATA_764369 if SMP
        select ARM_ERRATA_775420
        select ARM_GIC