Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

platform: generic: move fdt_reset_init to final_init

Browse Source 
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>
This commit is contained in:
Heinrich Schuchardt
2021-11-06 10:54:50 +01:00
committed by Anup Patel
parent 2fe2f55d50
commit 57f094e67e
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platform/generic/platform.c
View File

@@ -120,18 +120,10 @@ fail:
static int generic_early_init(bool cold_boot) static int generic_early_init(bool cold_boot)
{ {
int rc; if (!generic_plat || !generic_plat->early_init)
if (generic_plat && generic_plat->early_init) {
rc = generic_plat->early_init(cold_boot, generic_plat_match);
if (rc)
return rc;
}
if (!cold_boot)
return 0; return 0;
return fdt_reset_init(); return generic_plat->early_init(cold_boot, generic_plat_match);
} }
static int generic_final_init(bool cold_boot) static int generic_final_init(bool cold_boot)
@@ -139,6 +131,9 @@ static int generic_final_init(bool cold_boot)
void *fdt; void *fdt;
int rc; int rc;
if (cold_boot)
fdt_reset_init();
if (generic_plat && generic_plat->final_init) { if (generic_plat && generic_plat->final_init) {
rc = generic_plat->final_init(cold_boot, generic_plat_match); rc = generic_plat->final_init(cold_boot, generic_plat_match);
if (rc) if (rc)