aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Delaunay <patrick.delaunay@foss.st.com>2022-04-15 14:43:23 +0200
committerPatrice Chotard <patrice.chotard@foss.st.com>2022-05-10 10:56:39 +0200
commit6a69eaf6f43840b05d7093c2728b2b6b011c31de (patch)
tree3b286ff8d1f5380a4002b3dec9ac43bb75f135c9
parent5367b67be4a3d26197fe5bf7baef2bf125997047 (diff)
downloadu-boot-6a69eaf6f43840b05d7093c2728b2b6b011c31de.zip
u-boot-6a69eaf6f43840b05d7093c2728b2b6b011c31de.tar.gz
u-boot-6a69eaf6f43840b05d7093c2728b2b6b011c31de.tar.bz2
ARM: stm32mp: skip ft_system_setup when the soc node is absent
The function ft_system_setup shouldn't return an error when the /soc node is absent in the provided device tree but just skip the updates. This patch solves an issue when the U-Boot pytest is executed on board. Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com> Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
-rw-r--r--arch/arm/mach-stm32mp/fdt.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 91330a6..b1a4b76 100644
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -260,6 +260,9 @@ int ft_system_setup(void *blob, struct bd_info *bd)
char name[SOC_NAME_SIZE];
soc = fdt_path_offset(blob, "/soc");
+ /* when absent, nothing to do */
+ if (soc == -FDT_ERR_NOTFOUND)
+ return 0;
if (soc < 0)
return soc;