From a0778ac9b2bbea342062dac95ab86e52de463d70 Mon Sep 17 00:00:00 2001 From: zhang sanshan Date: Fri, 21 Sep 2018 16:49:46 +0800 Subject: MA-12847 [Android] skip checking the resource on android auto camera sometime can't been open once run M4 image. ISI-CH0 probe funtion is not called when meet issue. The root cause is: M4 image set assign resource SC_R_ISI_CH0 into m4 partition when open camera in m4 side. Uboot will call update_fdt_with_owned_resources to check the pd in current dts node. it will call sc_rm_is_resource_owned to check the pd whether in other partition, If yes, it will delete the dts node. uboot delete isi_0 node whose pd is SC_R_ISI_CH0. Change-Id: I4e2afbed2c55caad0a9f804fa8d85511c3bfea38 Signed-off-by: zhang sanshan (cherry picked from commit 23487f8f3ea5406fe37a15f4191ca9ed5350829d) --- arch/arm/mach-imx/imx8/cpu.c | 2 ++ include/configs/imx8qm_mek_android_auto.h | 1 + scripts/config_whitelist.txt | 1 + 3 files changed, 4 insertions(+) diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index c0bcfb2028..6f4692e43a 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -1311,7 +1311,9 @@ int ft_system_setup(void *blob, bd_t *bd) fdt_strerror(off)); #endif +#ifndef CONFIG_SKIP_RESOURCE_CHECING update_fdt_with_owned_resources(blob); +#endif update_fdt_edma_nodes(blob); #ifdef CONFIG_IMX_SMMU diff --git a/include/configs/imx8qm_mek_android_auto.h b/include/configs/imx8qm_mek_android_auto.h index 119b58249b..ebdc1bcc5a 100644 --- a/include/configs/imx8qm_mek_android_auto.h +++ b/include/configs/imx8qm_mek_android_auto.h @@ -17,6 +17,7 @@ #define NS_ARCH_ARM64 1 #endif +#define CONFIG_SKIP_RESOURCE_CHECING /* USB OTG controller configs */ #ifdef CONFIG_USB_EHCI_HCD #ifndef CONFIG_MXC_USB_PORTSC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 86fe74a0b8..ec9ec35392 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1878,6 +1878,7 @@ CONFIG_SIMU CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION CONFIG_SKIP_LOWLEVEL_INIT CONFIG_SKIP_LOWLEVEL_INIT_ONLY +CONFIG_SKIP_RESOURCE_CHECING CONFIG_SKIP_TRUNOFF_WATCHDOG CONFIG_SLIC CONFIG_SLTTMR -- cgit v1.2.3