MA-19032 android: imx8: don't initialize caam in uboot

CAAM JR0/JR1 are reserved for SECO, JR2/JR3 will be used in
Trusty OS for android. As Android doesn't need the caam
in uboot for imx8q, so bypass the caam JR probe to avoid
conflicts.

Change-Id: Id4ffe9fbb466abfeadc2c18e4b5d7e1b68360ab5
Signed-off-by: Ji Luo <ji.luo@nxp.com>

diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c
index 519a684..2eba5eb 100644 (file)
--- a/arch/arm/mach-imx/imx8/cpu.c
+++ b/arch/arm/mach-imx/imx8/cpu.c
@@ -105,6 +105,7 @@ int arch_cpu_init_dm(void)
 #if defined(CONFIG_ARCH_MISC_INIT)
 int arch_misc_init(void)
 {
+#if !defined(CONFIG_ANDROID_SUPPORT) && !defined(CONFIG_ANDROID_AUTO_SUPPORT)
        struct udevice *dev;
        int node, ret;
 
@@ -120,6 +121,7 @@ int arch_misc_init(void)
                return ret;
        }
        device_probe(dev);
+#endif
 
        return 0;
 }