summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/include/usr/pnor/pnor_const.H1
-rw-r--r--src/usr/isteps/istep20/call_host_load_payload.C8
-rw-r--r--src/usr/pnor/pnor_utils.C2
3 files changed, 10 insertions, 1 deletions
diff --git a/src/include/usr/pnor/pnor_const.H b/src/include/usr/pnor/pnor_const.H
index 0b6b5e9ab..c975c684c 100644
--- a/src/include/usr/pnor/pnor_const.H
+++ b/src/include/usr/pnor/pnor_const.H
@@ -75,6 +75,7 @@ enum SectionId
HDAT, /**< HDAT data */
EECACHE,
OCMBFW, /**< OCMB image */
+ BOOTKERNEL, /**< Bootkernel -- HB uses for PHYP */
#endif
NUM_SECTIONS, /**< Number of defined sections */
diff --git a/src/usr/isteps/istep20/call_host_load_payload.C b/src/usr/isteps/istep20/call_host_load_payload.C
index b0b9f3e5c..5190649c9 100644
--- a/src/usr/isteps/istep20/call_host_load_payload.C
+++ b/src/usr/isteps/istep20/call_host_load_payload.C
@@ -120,7 +120,13 @@ void* call_host_load_payload (void *io_pArgs)
// Load payload data in PHYP mode or in Sapphire mode
if(is_sapphire_load() || is_phyp_load())
{
- l_err = load_pnor_section( PNOR::PAYLOAD, payloadBase );
+ PNOR::SectionId l_secID = PNOR::PAYLOAD;
+ if (is_phyp_load())
+ {
+ l_secID = PNOR::BOOTKERNEL;
+ }
+
+ l_err = load_pnor_section( l_secID, payloadBase );
if ( l_err )
{
TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
diff --git a/src/usr/pnor/pnor_utils.C b/src/usr/pnor/pnor_utils.C
index e09b85e6c..83ff90450 100644
--- a/src/usr/pnor/pnor_utils.C
+++ b/src/usr/pnor/pnor_utils.C
@@ -344,6 +344,7 @@ bool PNOR::isEnforcedSecureSection(const uint32_t i_section)
i_section == HB_DATA ||
i_section == SBE_IPL ||
i_section == PAYLOAD ||
+ i_section == BOOTKERNEL ||
i_section == SBKT ||
i_section == OCC ||
i_section == HCODE ||
@@ -426,6 +427,7 @@ const char * PNOR::SectionIdToString( uint32_t i_secIdIndex )
"HDAT", /**< PNOR::HDAT : Hdat Data */
"EECACHE", /**< PNOR::EECACHE : Cached data from various EEPROMs */
"OCMBFW", /**< PNOR::OCMBFW : OCMB image */
+ "BOOTKERNEL", /**< PNOR::BOOTKERNEL : OPAL == petitboot,PHYP == PowerVM */
#endif
};
OpenPOWER on IntegriCloud