core/init.c: move stb_init to later in the boot

PNOR partitions downloaded by the resource load framework are not being
measured in habanero, but they should be. The problem is that the
Nuvoton TPM driver is failing to be loaded.

The Nuvoton TPM driver is loaded in stb_init(), but when stb_init() is
called the P8 I2C bus has not been initialized yet. Error message:
"NUVOTON: ibm,opal-id property not found, tpm node parent ..."

This moves stb_init() to later in the boot to meet all its requirements.

Signed-off-by: Claudio Carvalho <cclaudio@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/core/init.c b/core/init.c
index 790db14..871c2a2 100644
--- a/core/init.c
+++ b/core/init.c
@@ -830,9 +830,6 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt)
 	 */
 	probe_platform();
 
-	/* Secure/Trusted Boot init. We look for /ibm,secureboot in DT */
-	stb_init();
-
 	/* Initialize the rest of the cpu thread structs */
 	init_all_cpus();
 
@@ -896,6 +893,9 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt)
 	if (platform.init)
 		platform.init();
 
+	/* Secure/Trusted Boot init. We look for /ibm,secureboot in DT */
+	stb_init();
+
 	/* Setup dummy console nodes if it's enabled */
 	if (dummy_console_enabled())
 		dummy_console_add_nodes();