[Skiboot] [PATCH v2 09/12] platforms/astbmc: initialize libstb for habanero

[Claudio Carvalho]

Hostboot is adding trusted boot support for habanero.
This initializes libstb for habanero in skiboot.

Signed-off-by: Claudio Carvalho <cclaudio at linux.vnet.ibm.com>
---
 platforms/astbmc/astbmc.h   | 1 +
 platforms/astbmc/common.c   | 7 +++++++
 platforms/astbmc/habanero.c | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/platforms/astbmc/astbmc.h b/platforms/astbmc/astbmc.h
index 322282e..a4108fb 100644
--- a/platforms/astbmc/astbmc.h
+++ b/platforms/astbmc/astbmc.h
@@ -45,6 +45,7 @@ extern void astbmc_early_init(void);
 extern int64_t astbmc_ipmi_reboot(void);
 extern int64_t astbmc_ipmi_power_down(uint64_t request);
 extern void astbmc_init(void);
+extern void astbmc_stb_init(void);
 extern void astbmc_ext_irq_serirq_cpld(unsigned int chip_id);
 extern int pnor_init(void);
 
diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c
index e1a8a4d..ea1d2fd 100644
--- a/platforms/astbmc/common.c
+++ b/platforms/astbmc/common.c
@@ -26,6 +26,7 @@
 #include <bt.h>
 #include <errorlog.h>
 #include <lpc.h>
+#include <libstb/stb.h>
 
 #include "astbmc.h"
 
@@ -142,6 +143,12 @@ void astbmc_init(void)
 		uart_setup_opal_console();
 }
 
+void astbmc_stb_init(void)
+{
+	stb_init();
+	astbmc_init();
+}
+
 int64_t astbmc_ipmi_power_down(uint64_t request)
 {
 	if (request != IPMI_CHASSIS_PWR_DOWN) {
diff --git a/platforms/astbmc/habanero.c b/platforms/astbmc/habanero.c
index 738aa63..cd2cfa4 100644
--- a/platforms/astbmc/habanero.c
+++ b/platforms/astbmc/habanero.c
@@ -142,7 +142,7 @@ static bool habanero_probe(void)
 DECLARE_PLATFORM(habanero) = {
 	.name			= "Habanero",
 	.probe			= habanero_probe,
-	.init			= astbmc_init,
+	.init			= astbmc_stb_init,
 	.pci_get_slot_info	= slot_table_get_slot_info,
 	.external_irq		= astbmc_ext_irq_serirq_cpld,
 	.cec_power_down         = astbmc_ipmi_power_down,
-- 
1.9.1