diff options
| -rw-r--r-- | src/HBconfig | 5 | ||||
| -rw-r--r-- | src/build/configs/vpo.cnfg | 5 | ||||
| -rw-r--r-- | src/usr/initservice/istepdispatcher/istepdispatcher.C | 4 | ||||
| -rw-r--r-- | src/usr/isteps/istep14/call_proc_exit_cache_contained.C | 3 | ||||
| -rw-r--r-- | src/usr/secureboot/base/service.C | 6 | ||||
| -rwxr-xr-x | src/usr/targeting/attrrp.C | 7 | ||||
| -rw-r--r-- | src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml | 2 |
7 files changed, 26 insertions, 6 deletions
diff --git a/src/HBconfig b/src/HBconfig index c25cadfae..5ea7c15ca 100644 --- a/src/HBconfig +++ b/src/HBconfig @@ -4,6 +4,11 @@ config VPO_COMPILE help Compile and build image for VPO environment +config P9_VPO_COMPILE + default n + help + Compile and build image for VPO environment + config BMC_AST2400 default n help diff --git a/src/build/configs/vpo.cnfg b/src/build/configs/vpo.cnfg new file mode 100644 index 000000000..f66b26f5f --- /dev/null +++ b/src/build/configs/vpo.cnfg @@ -0,0 +1,5 @@ +unset SFC_IS_AST2400 +unset SFC_IS_IBM_DPSS +set SFC_IS_FAKE +set P9_VPO_COMPILE +set SKIP_RESTRICT_EC_UNITS diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index bd9421682..7439da360 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -651,6 +651,10 @@ errlHndl_t IStepDispatcher::doIstep(uint32_t i_istep, // If the step has valid work to be done, then execute it. if(NULL != theStep) { +#ifdef CONFIG_P9_VPO_COMPILE //extra traces to printk for vpo debug + printk("doIstep: step %d, substep %d, " + "task %s\n", i_istep, i_substep, theStep->taskname); +#endif TRACFCOMP(g_trac_initsvc,ENTER_MRK"doIstep: step %d, substep %d, " "task %s", i_istep, i_substep, theStep->taskname); diff --git a/src/usr/isteps/istep14/call_proc_exit_cache_contained.C b/src/usr/isteps/istep14/call_proc_exit_cache_contained.C index 0e9753a9d..9cc55ac08 100644 --- a/src/usr/isteps/istep14/call_proc_exit_cache_contained.C +++ b/src/usr/isteps/istep14/call_proc_exit_cache_contained.C @@ -51,6 +51,7 @@ // Add P9 - Fake trigger for memory expansion #include <kernel/console.H> // printk status #include <devicefw/userif.H> +#include <config.h> // @TODO RTC:134082 remove above block using namespace ISTEP; @@ -245,7 +246,7 @@ void* call_proc_exit_cache_contained (void *io_pArgs) "SUCCESS : call_proc_exit_cache_contained on all procs" ); // @TODO RTC:134082 remove below block -#if 1 +#ifndef CONFIG_P9_VPO_COMPILE // Add P9 - Fake trigger for memory expansion TARGETING::Target* l_masterProc = NULL; TARGETING::targetService() diff --git a/src/usr/secureboot/base/service.C b/src/usr/secureboot/base/service.C index 76b7eea13..d3159c1f2 100644 --- a/src/usr/secureboot/base/service.C +++ b/src/usr/secureboot/base/service.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -43,7 +43,7 @@ namespace SECUREBOOT { // Don't blind purge in VPO -#ifndef CONFIG_VPO_COMPILE +#ifndef CONFIG_P9_VPO_COMPILE // Load original secureboot header. if (enabled()) @@ -64,7 +64,7 @@ namespace SECUREBOOT assert(0 == mm_extend(MM_EXTEND_POST_SECUREBOOT)); // Disable SecureROM in VPO -#ifndef CONFIG_VPO_COMPILE +#ifndef CONFIG_P9_VPO_COMPILE // Initialize the Secure ROM l_errl = initializeSecureROM(); if (l_errl) diff --git a/src/usr/targeting/attrrp.C b/src/usr/targeting/attrrp.C index de861eb01..780de9568 100755 --- a/src/usr/targeting/attrrp.C +++ b/src/usr/targeting/attrrp.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2015 */ +/* Contributors Listed Below - COPYRIGHT 2011,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -272,6 +272,11 @@ namespace TARGETING // Validate eye catch. if (l_header->eyeCatcher != PNOR_TARG_EYE_CATCHER) { + TRACFCOMP(g_trac_targeting, + "ATTR_DATA section in pnor header mismatch found" + " header: %d expected header: %d", + l_header->eyeCatcher, + PNOR_TARG_EYE_CATCHER); /*@ * @errortype * @moduleid TARG_MOD_ATTRRP diff --git a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml index f7d0cb7cd..1ff876556 100644 --- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER HostBoot Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2012,2016 --> +<!-- Contributors Listed Below - COPYRIGHT 2016 --> <!-- [+] International Business Machines Corp. --> <!-- --> <!-- --> |
