diff options
| author | Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com> | 2018-02-06 07:46:34 +0530 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-02-08 18:21:42 -0600 |
| commit | e15174aca0ab0d10d796c014b9c0ed124890645e (patch) | |
| tree | 381b1f64623b8cffc7285dc82333fee5eb394ff3 | |
| parent | b772e1132cd51368fab686ce4dd60f3850cfbbfb (diff) | |
| download | skiboot-e15174aca0ab0d10d796c014b9c0ed124890645e.zip skiboot-e15174aca0ab0d10d796c014b9c0ed124890645e.tar.gz skiboot-e15174aca0ab0d10d796c014b9c0ed124890645e.tar.bz2 | |
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 <ppaidipe@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | core/init.c | 6 |
1 files 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(); |