From e15174aca0ab0d10d796c014b9c0ed124890645e Mon Sep 17 00:00:00 2001 From: Pridhiviraj Paidipeddi Date: Tue, 6 Feb 2018 07:46:34 +0530 Subject: core/init: move imc catalog preload init after the STB init. As a safer side move the imc catalog preload after the STB init to make sure the imc catalog resource get's verified and measured properly during loading when both secure and trusted boot modes are on. Signed-off-by: Pridhiviraj Paidipeddi Signed-off-by: Stewart Smith --- core/init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/init.c b/core/init.c index ec9f329..6eb4d83 100644 --- a/core/init.c +++ b/core/init.c @@ -997,9 +997,6 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) /* Read in NVRAM and set it up */ nvram_init(); - /* preload the IMC catalog dtb */ - imc_catalog_preload(); - /* Set the console level */ console_log_level(); @@ -1007,6 +1004,9 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) secureboot_init(); trustedboot_init(); + /* preload the IMC catalog dtb */ + imc_catalog_preload(); + /* Install the OPAL Console handlers */ init_opal_console(); -- cgit v1.1