From 11126b31964eabdd321cdbc284e0abccfc6af9cd Mon Sep 17 00:00:00 2001 From: Ji Luo Date: Thu, 14 May 2020 16:34:19 +0800 Subject: [PATCH] MA-13050-5 [Android] support evs on mek-8qxp board 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. add CONFIG_SKIP_RESOURCE_CHECKING to skip checking resource when load dtb. Change-Id: Iaf9a5eda07074c45c15c43f23cb6ad6b5a77de47 Signed-off-by: zhang sanshan (cherry picked from commit: bd0682f5b3208525363690d446bc86da15a43120) --- arch/arm/mach-imx/imx8/fdt.c | 2 ++ scripts/config_whitelist.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c index 8c9cf36d81..b331f7d6d5 100644 --- a/arch/arm/mach-imx/imx8/fdt.c +++ b/arch/arm/mach-imx/imx8/fdt.c @@ -588,7 +588,9 @@ int ft_system_setup(void *blob, struct bd_info *bd) fdt_strerror(off)); } +#ifndef CONFIG_SKIP_RESOURCE_CHECKING update_fdt_with_owned_resources(blob); +#endif update_fdt_edma_nodes(blob); if (is_imx8qm()) { diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2b640fb41e..b40245d6c8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1488,6 +1488,7 @@ CONFIG_SIEMENS_MACH_TYPE CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION CONFIG_SKIP_LOWLEVEL_INIT CONFIG_SKIP_LOWLEVEL_INIT_ONLY +CONFIG_SKIP_RESOURCE_CHECKING CONFIG_SKIP_TRUNOFF_WATCHDOG CONFIG_SLIC CONFIG_SLTTMR -- 2.17.1