P8+ VPO - HB supports to istep 7 for NVLINK test

Change-Id: I79ec79e1601ae51bf759b80a07c5b4cf2d97fc5c
RTC: 95236
Depends-On: I19823ac32a963d7072d21140b828c30ab326a19f
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/14468
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 12 insertions, 5 deletions

diff --git a/src/usr/secureboot/base/service.C b/src/usr/secureboot/base/service.C
index 98e026205..76b7eea13 100644
--- a/src/usr/secureboot/base/service.C
+++ b/src/usr/secureboot/base/service.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -25,6 +27,7 @@
 #include <sys/mm.h>
 #include <util/singleton.H>
 #include <secureboot/secure_reasoncodes.H>
+#include <config.h>
 
 #include "settings.H"
 #include "header.H"
@@ -38,6 +41,10 @@ namespace SECUREBOOT
 
         do
         {
+
+// Don't blind purge in VPO
+#ifndef CONFIG_VPO_COMPILE
+
             // Load original secureboot header.
             if (enabled())
             {
@@ -50,21 +57,21 @@ namespace SECUREBOOT
             {
                 break;
             }
-
+#endif
             // Extend memory footprint into lower portion of cache.
             //   This can only fail is someone has already called to extend
             //   to post-secureboot state.  Major coding bug, so just assert.
             assert(0 == mm_extend(MM_EXTEND_POST_SECUREBOOT));
 
-
+// Disable SecureROM in VPO
+#ifndef CONFIG_VPO_COMPILE
             // Initialize the Secure ROM
             l_errl = initializeSecureROM();
             if (l_errl)
             {
                 break;
             }
-
-
+#endif
         } while(0);
 
         return l_errl;