From 57f094e67e0642a16889e9bce64266a4e378683b Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 6 Nov 2021 10:54:50 +0100 Subject: platform: generic: move fdt_reset_init to final_init Move the fdt_reset_init() invocation from generic_early_init() to generic_final_init(). This allows to print error messages. Ignore the return value of fdt_reset_init() as we should not stop booting due to failure to initialize reset drivers. Signed-off-by: Heinrich Schuchardt Reviewed-by: Dong Du Reviewed-by: Anup Patel --- platform/generic/platform.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/platform/generic/platform.c b/platform/generic/platform.c index 276f64e..bc6e761 100644 --- a/platform/generic/platform.c +++ b/platform/generic/platform.c @@ -120,18 +120,10 @@ fail: static int generic_early_init(bool cold_boot) { - int rc; - - if (generic_plat && generic_plat->early_init) { - rc = generic_plat->early_init(cold_boot, generic_plat_match); - if (rc) - return rc; - } - - if (!cold_boot) + if (!generic_plat || !generic_plat->early_init) return 0; - return fdt_reset_init(); + return generic_plat->early_init(cold_boot, generic_plat_match); } static int generic_final_init(bool cold_boot) @@ -139,6 +131,9 @@ static int generic_final_init(bool cold_boot) void *fdt; int rc; + if (cold_boot) + fdt_reset_init(); + if (generic_plat && generic_plat->final_init) { rc = generic_plat->final_init(cold_boot, generic_plat_match); if (rc) -- cgit v1.2.3