From 8a969e59cfa5543ccb963287cd2efc551b534b28 Mon Sep 17 00:00:00 2001
From: Dean Sanner <dsanner@us.ibm.com>
Date: Sat, 7 Jan 2017 09:16:48 -0600
Subject: Always build HDAT for OpenPOWER systems

Change-Id: Ic691b58c9249b47d32dbc0ad4230396e37e72b6d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34532
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: NAGENDRA K. GURRAM <nagendra.g@in.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
---
 src/usr/hdat/hdatnaca.C | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/usr/hdat/hdatnaca.C')

diff --git a/src/usr/hdat/hdatnaca.C b/src/usr/hdat/hdatnaca.C
index 520a85022..d7cb1758b 100644
--- a/src/usr/hdat/hdatnaca.C
+++ b/src/usr/hdat/hdatnaca.C
@@ -156,8 +156,17 @@ void *  call_hdat_steps( void *io_pArgs )
     hdat5Tuple_t l_spirasHostEntry, l_spirhCpuCtrlEntry;
     do {
 
-        //true => FSP present. OR ! running on PHYP mode
-        if(INITSERVICE::spBaseServicesEnabled() || !(is_phyp_load()))
+        TARGETING::Target * sys = NULL;
+        TARGETING::targetService().getTopLevelTarget( sys );
+        assert(sys != NULL);
+
+        // Figure out what kind of payload we have
+        TARGETING::PAYLOAD_KIND payload_kind
+                 = sys->getAttr<TARGETING::ATTR_PAYLOAD_KIND>();
+
+        //true => FSP present. OR Payload Kind None
+        if(INITSERVICE::spBaseServicesEnabled() ||
+                    payload_kind == TARGETING::PAYLOAD_KIND_NONE  )
         {
             break;
         }
-- 
cgit v1.2.1