From d8af77989a65cd5537d2c02ac9074d866db3673c Mon Sep 17 00:00:00 2001
From: Santosh Puranik <santosh.puranik@in.ibm.com>
Date: Sun, 19 Feb 2017 05:54:18 -0600
Subject: Remove CHIP_UNIT_POS workaround

Change-Id: Id5cd5cf77dd9a9dbf02a70b7a7f9dd4ebaedc6fc
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36705
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Santosh S. Puranik <santosh.puranik@in.ibm.com>
---
 src/tools/scripts/ppeParseAttributeInfo.pl | 52 +++++++++++++++---------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/scripts/ppeParseAttributeInfo.pl b/src/tools/scripts/ppeParseAttributeInfo.pl
index 97188e8a..c3f213cd 100755
--- a/src/tools/scripts/ppeParseAttributeInfo.pl
+++ b/src/tools/scripts/ppeParseAttributeInfo.pl
@@ -480,38 +480,38 @@ foreach my $entr (@{$entries->{entry}}) {
 
             print AIFILE "const fapi2::TargetType $attr->{id}_TargetType = ";
 
-            if($attr->{id} eq 'ATTR_CHIP_UNIT_POS')
-            {
-                # Default CHIP_UNIT_POS to all chiplet class targets
-                print AIFILE "TARGET_TYPE_CHIPLETS";
-            }
-            else
-            {
-                # Split on commas
-                my @targTypes = split(',', $attr->{targetType});
-                my $targType = $targTypes[0];
+            # Split on commas
+            my @targTypes = split(',', $attr->{targetType});
+            my $targType = $targTypes[0];
+            my $targetTypeCount = 0;
 
-                foreach my $targType (@targTypes)
+            foreach my $targType (@targTypes)
+            {
+                # Remove newlines and leading/trailing whitespace
+                $targType =~ s/\n//;
+                $targType =~ s/^\s+//;
+                $targType =~ s/\s+$//;
+
+                # Consider only supported target types. The rest are ignored
+                if($targType ~~ ["TARGET_TYPE_PROC_CHIP", "TARGET_TYPE_SYSTEM",
+                    "TARGET_TYPE_CORE", "TARGET_TYPE_MCS", "TARGET_TYPE_PERV",
+                    "TARGET_TYPE_EQ", "TARGET_TYPE_EX"])
                 {
-                    # Remove newlines and leading/trailing whitespace
-                    $targType =~ s/\n//;
-                    $targType =~ s/^\s+//;
-                    $targType =~ s/\s+$//;
-
-                    # Consider only supported target types. The rest are ignored
-                    if($targType ~~ ["TARGET_TYPE_PROC_CHIP", "TARGET_TYPE_SYSTEM",
-                        "TARGET_TYPE_CORE", "TARGET_TYPE_MCS", "TARGET_TYPE_PERV",
-                        "TARGET_TYPE_EQ", "TARGET_TYPE_EX"])
+                    if($targetTypeCount != 0)
                     {
-                        print AIFILE "$targType";
-                        last;
-                    }
-                    else
-                    {
-                        next;
+                        print AIFILE " | ";
                     }
+                    print AIFILE "$targType";
+                    $targetTypeCount++;
                 }
             }
+
+            if($targetTypeCount == 0)
+            {
+                print ("fapiParseAttributeInfo.pl ERROR. Unsupported target type $attr->{targetType} for $attr->{id} in $infile\n");
+                exit(1);
+            }
+
             print AIFILE ";\n";
 
             #----------------------------------------------------------------------
-- 
cgit v1.2.1