diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2021-11-06 12:54:50 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2021-11-08 08:12:05 +0300 |
| commit | 57f094e67e0642a16889e9bce64266a4e378683b (patch) | |
| tree | 8b9a097a49da203f2942f22ac26bab4da1e1078a | |
| parent | 2fe2f55d5050aac546d35616f2944f889a9c8d6e (diff) | |
| download | opensbi-57f094e67e0642a16889e9bce64266a4e378683b.tar.xz | |
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 <heinrich.schuchardt@canonical.com>
Reviewed-by: Dong Du <Dd_nirvana@sjtu.edu.cn>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
| -rw-r--r-- | platform/generic/platform.c | 15 |
1 files 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) |