Fix handling of FAPI attributes with target type TARGET_TYPE_SYSTEM

Change-Id: I274f39ffdd894960b3b281889d2e266c54a4c7f6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30910
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 13 insertions, 0 deletions

diff --git a/src/usr/targeting/xmltohb/updatetempsxml.pl b/src/usr/targeting/xmltohb/updatetempsxml.pl
index 5e5205651..5c2031a8d 100755
--- a/src/usr/targeting/xmltohb/updatetempsxml.pl
+++ b/src/usr/targeting/xmltohb/updatetempsxml.pl
@@ -190,6 +190,9 @@ foreach my $TempAttr ( @{$fwDfltsXml->{attribute}} )
                     $type =~ s/_ENDPOINT//;
                     $type =~ s/_CHIPLET//;
                     $type =~ s/_CHIP//;
+                    $type =~ s/^SYSTEM$/SYS/;
+
+                    my $msgNotNeeded = 0;
 
                     # Loop through target type info from temp_generic.xml file
                     for my $i ( 0 .. $#TgtTypeInfo)
@@ -211,15 +214,25 @@ foreach my $TempAttr ( @{$fwDfltsXml->{attribute}} )
                                 push @UpdtTgt, [ $TgtTypeInfo[$i][0], $type,
                                                  $generic_id, ""];
                             }
+                            $msgNotNeeded = 1;
                         }
                         elsif($TgtTypeInfo[$i][2] =~ /\s$generic_id\s/)
                         {
                             print STDERR "Target $TgtTypeInfo[$i][0] of type ".
                                   "$type already has attribute $generic_id\n";
+                            $msgNotNeeded = 1;
                         }
                     }
+
+                    print STDERR "Type $type not found in $fapi for attribute ".
+                          "$generic_id\n" if($msgNotNeeded == 0);
                 }
             }
+            else
+            {
+                 die "FATAL: FAPI attribute $fapi_id is not associated with ".
+                     "any specific target type\n";
+            }
 
             # Non-platInit attributes need to be volatile-zeroed
             #  or xmltohb.pl will throw an error