diff options
author | Claudio Carvalho <cclaudio@linux.vnet.ibm.com> | 2017-12-09 02:52:26 -0200 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-12-18 21:30:57 -0600 |
commit | 5fdcc35fc1030638d17440507ef087d5da91e8bd (patch) | |
tree | 9c85dd4ab17ff5556862b5225b1abaa609d754c3 /core/init.c | |
parent | 48753eb9eb722f20ddb8c44f1cfb32ef9475c8fa (diff) | |
download | skiboot-5fdcc35fc1030638d17440507ef087d5da91e8bd.zip skiboot-5fdcc35fc1030638d17440507ef087d5da91e8bd.tar.gz skiboot-5fdcc35fc1030638d17440507ef087d5da91e8bd.tar.bz2 |
core: update superseded libstb calls in flash.c and init.c
List of libstb calls that were superseded:
sb_verify() -> secureboot_verify()
tb_measure() -> trustedboot_measure()
stb_final() -> trustedboot_exit_boot_services()
stb_init() -> secureboot_init() and trustedboot_init()
The new functions are supported in both P8 and P9.
Signed-off-by: Claudio Carvalho <cclaudio@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'core/init.c')
-rw-r--r-- | core/init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/init.c b/core/init.c index 1c822f1..06d5190 100644 --- a/core/init.c +++ b/core/init.c @@ -46,8 +46,8 @@ #include <xive.h> #include <nvram.h> #include <vas.h> -#include <libstb/stb.h> -#include <libstb/container.h> +#include <libstb/secureboot.h> +#include <libstb/trustedboot.h> #include <phys-map.h> #include <imc.h> @@ -417,7 +417,7 @@ static bool load_kernel(void) return false; } - stb_final(); + trustedboot_exit_boot_services(); return true; } @@ -993,7 +993,8 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) console_log_level(); /* Secure/Trusted Boot init. We look for /ibm,secureboot in DT */ - stb_init(); + secureboot_init(); + trustedboot_init(); /* Install the OPAL Console handlers */ init_opal_console(); |