|
@@ -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)
|