lib: sbi: move sbi_boot_print_general()

Moving the sbi_boot_print_general() call after the
sbi_platform_final_init() call allows to print devices initialized in the
latter.

To keep the overall print sequence the same also move
sbi_boot_print_domains().

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>

diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c
index b1c7cf0..83043c5 100644 (file)
--- a/lib/sbi/sbi_init.c
+++ b/lib/sbi/sbi_init.c
@@ -301,8 +301,6 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
                sbi_hart_hang();
        }
 
-       sbi_boot_print_general(scratch);
-
        /*
         * Note: Finalize domains after HSM initialization so that we
         * can startup non-root domains.
@@ -316,8 +314,6 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
                sbi_hart_hang();
        }
 
-       sbi_boot_print_domains(scratch);
-
        rc = sbi_hart_pmp_configure(scratch);
        if (rc) {
                sbi_printf("%s: PMP configure failed (error %d)\n",
@@ -336,6 +332,10 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
                sbi_hart_hang();
        }
 
+       sbi_boot_print_general(scratch);
+
+       sbi_boot_print_domains(scratch);
+
        sbi_boot_print_hart(scratch, hartid);
 
        wake_coldboot_harts(scratch, hartid);