Look for FSPs before deciding payload type

Change-Id: I43c53949ba17e23f94ae34694b8ff02d0b574a0c
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13978
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 16 insertions, 3 deletions

diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 694477512..221f0d742 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -2018,7 +2018,19 @@ sub generate_sys
         </default>
     </attribute>
     <attribute>
-        <id>PAYLOAD_KIND</id>
+        <id>PAYLOAD_KIND</id>\n";
+
+    # If we have FSPs, we setup the default as PHYP, and the FSP
+    # will set this up correctly. We can't just add the SAPPHIRE as a
+    # default because the FSP assumes the PAYLOAD_BASE comes via
+    # attribute_types.xml
+    if ($haveFSPs)
+    {
+        print "        <default>PHYP</default>\n";
+    }
+    else
+    {
+        print "
         <default>SAPPHIRE</default>
     </attribute>
     <attribute>
@@ -2027,8 +2039,9 @@ sub generate_sys
     </attribute>
     <attribute>
         <id>PAYLOAD_ENTRY</id>
-        <default>0x10</default>
-    </attribute>";
+        <default>0x10</default>\n";
+    }
+    print "    </attribute>";
 
     generate_max_config();