move xml files to importtemp directory

included fixed sections default settings
included fixed image generation.
updated Makefile run sections

Change-Id: I97547e339f5c956b31d444a74c6faa8159884072
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18699
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Derk Rembold <rembold@de.ibm.com>
Tested-by: Derk Rembold <rembold@de.ibm.com>

10 files changed, 171 insertions, 639 deletions

diff --git a/tools/image/ppeSetFixed.pl b/tools/image/ppeSetFixed.pl
index cd65761a..8d781d23 100644..100755
--- a/tools/image/ppeSetFixed.pl
+++ b/tools/image/ppeSetFixed.pl
@@ -4,6 +4,9 @@
 
 use strict;
 
+my $attrpath = "../../importtemp/xml";
+my $sbedefaultpath = "../../script/image";
+
 #------------------------------------------------------------------------------
 # Print Command Line Help
 #------------------------------------------------------------------------------
@@ -15,9 +18,15 @@ if ($numArgs < 3)
     print ("  and parse the attribute file to lookup the types.\n");
     print ("  The default values will be set in the image.\n");
     print ("example:\n");
-    print ("./ppeSetFixed.pl ./sbe_main.bin  ../scripts/ppe_attributes.xml \\\n" );
-    print ("../scripts/perv_attributes.xml ../scripts/proc_attributes.xml \\\n" );
-    print ("../scripts/ex_attributes.xml ../scripts/eq_attributes.xml ../scripts/core_attributes.xml \n");
+    print ("./ppeSetFixed.pl \\\n" );
+    print (". \\\n" );
+    print (" ../../sbe/obj/seeprom_main.bin \\\n" );
+    print ("$attrpath/p9_ppe_attributes.xml \\\n" );
+    print ("$attrpath/attribute_info/perv_attributes.xml \\\n" );
+    print ("$attrpath/attribute_info/proc_attributes.xml \\\n" );
+    print ("$attrpath/attribute_info/ex_attributes.xml \\\n" );
+    print ("$attrpath/attribute_info/eq_attributes.xml \\\n" );
+    print ("$attrpath/attribute_info/core_attributes.xml \n");
     exit(1);
 }
 
@@ -47,8 +56,9 @@ my $attribute = 'attribute';
 #------------------------------------------------------------------------------
 # For each argument
 #------------------------------------------------------------------------------
-my $image = $ARGV[0];
-my $argfile = $ARGV[1];
+my $sbedefaultpath = $ARGV[0];
+my $image = $ARGV[1];
+my $argfile = $ARGV[2];
 my $entries = $xml->XMLin($argfile, ForceArray => ['entry']);
 
 if ( ! -e $image) {die "ppeSetFixed.pl: $image $!"};
@@ -60,7 +70,7 @@ foreach my $entr (@{$entries->{entry}}) {
     # read XML file. The ForceArray option ensures that there is an array of
     # elements even if there is only one such element in the file
 
-    foreach my $argnum (2 .. $#ARGV)
+    foreach my $argnum (3 .. $#ARGV)
     {
         my $infile = $ARGV[$argnum];
 
@@ -130,63 +140,71 @@ setFixed("TARGET_TYPE_PERV", @attrPervIds);
 
 
 sub setFixed {
-    
+ 
     my ($string, @entries) =  @_;
+
+foreach my $attr (@entries)
+{
+
+    my $inname = $attr->{name};
     
-    foreach my $attr (@entries)
+    my @values = $attr->{value};
+
+
+    if(scalar @values > 0) {
+
+    foreach my $val (@values)
     {
+
+        if(defined $val && ref($val) eq "") {
+
+            if ($val =~ /(0x)?[0-9a-fA-F]+/) {
+             
+                my $systemRc = system("$sbedefaultpath/sbe_default_tool $image $inname $val $string 0");
         
-        my $inname = $attr->{name};
-        
-        my @values = $attr->{value};
-        
-        
-        if(scalar @values > 0) {
-            
-            foreach my $val (@values)
-            {
+                if ($systemRc) {
+                    print "sbe_default_tool: error in execution\n";
+                    exit 1;
+                }
                 
-                if(defined $val && ref($val) eq "") {
-                    
-                    if ($val =~ /(0x)?[0-9a-fA-F]+/) {
-                        
-                        my $systemRc = system("./sbe_default_tool $image $inname $val $string 0");
-                        
+            } else {
+                print ("ppeSetFixed.pl ERROR. not hex\n");
+                exit(1);
+            }
+
+        } elsif(defined $val && ref($val) eq "ARRAY") {
+
+            my $index = 0;
+
+            foreach my $arr (@{$val}) {
+
+                if(defined $arr && ref($arr) eq "") {
+                    if ($arr =~ /(0x)?[0-9a-fA-F]+/) {
+
+                        my $systemRc = system("$sbedefaultpath/sbe_default_tool $image $inname $arr $string $index");
+
                         if ($systemRc) {
                             print "sbe_default_tool: error in execution\n";
                             exit 1;
                         }
-                        
-                    } else {
-                        print ("ppeSetFixed.pl ERROR. not hex\n");
-                        exit(1);
+
+
                     }
-                    
-                } elsif(defined $val && ref($val) eq "ARRAY") {
-                    
-                    my $index = 0;
-                    
-                    foreach my $arr (@{$val}) {
-                        
-                        if(defined $arr && ref($arr) eq "") {
-                            if ($arr =~ /(0x)?[0-9a-fA-F]+/) {
-                                
-                                my $systemRc = system("./sbe_default_tool $image $inname $arr $string $index");
-                                
-                                if ($systemRc) {
-                                    print "sbe_default_tool: error in execution\n";
-                                    exit 1;
-                                }
-                                
-                                
-                            }
-                        }
-                        $index++;
-                    }                    
-                }       
+                }
+                $index++;
             }
-        }    
+
+
+
+        }
+
+
+    }
     }
+
+
+}
+
 }
 
 
diff --git a/tools/image/sbe_xip_tool.c b/tools/image/sbe_xip_tool.c
index ae136858..195a29ef 100644
--- a/tools/image/sbe_xip_tool.c
+++ b/tools/image/sbe_xip_tool.c
@@ -37,6 +37,7 @@
 //        sbe_xip_tool <image> [-<flag> ...] setv <item> <index> <value> [ <item1> <index1> <value1> ... ]
 //        sbe_xip_tool <image> [-<flag> ...] report [<regex>]
 //        sbe_xip_tool <image> [-<flag> ...] append <section> <file>
+//        sbe_xip_tool <image> [-<flag> ...] extract <section> <file>
 //        sbe_xip_tool <image> [-<flag> ...] delete [ <section0> ... <sectionN> ]
 //        sbe_xip_tool <image> [-<flag> ...] dis <section or .rings_summary>\n"//
 // 
@@ -91,6 +92,8 @@
 // section as the final section of the image. The 'append' command writes the
 // relocatable image address where the input file was loaded to stdout.
 //
+// The 'extract' command extracts a sections from the binary image.
+//
 // The 'delete' command deletes 0 or more sections, starting with <section0>.
 // Each section to be deleted must either be the final (highest address)
 // section of the image at the time it is deleted, or must be empty. The
@@ -115,6 +118,7 @@ const char* g_usage =
 "       sbe_xip_tool <image> [-i<flag> ...] setv <item> <index> <value> [ <item1> <index1> <value1> ... ]\n"
 "       sbe_xip_tool <image> [-i<flag> ...] report [<regex>]\n"
 "       sbe_xip_tool <image> [-i<flag> ...] append <section> <file>\n"
+"       sbe_xip_tool <image> [-i<flag> ...] extract <section> <file>\n"
 "       sbe_xip_tool <image> [-i<flag> ...] delete [ <section0> ... <sectionN> ]\n"
 "       sbe_xip_tool <image> [-i<flag> ...] dis <section or .rings_summary>\n"//\n"
 "\n"
@@ -169,6 +173,8 @@ const char* g_usage =
 "section as the final section of the image. The 'append' command writes the\n"
 "relocatable image address where the input file was loaded to stdout.\n"
 "\n"
+"The 'extract' command extracs a sections from a binary image.\n"
+"\n"
 "The 'delete' command deletes 0 or more sections, starting with <section0>.\n"
 "Each section to be deleted must either be the final (highest address)\n"
 "section of the image at the time it is deleted, or must be empty. The\n"
@@ -458,6 +464,7 @@ report(void* io_image, const int i_argc, const char** i_argv)
             control.regex = 1;
         } else {
             control.regex = 0;
+
             dumpHeader(io_image);
             printf("TOC Report\n\n");
         }
@@ -789,7 +796,6 @@ localStrtoul(const char* s)
 
 
 // Append a file to section
-
 int
 append(const char* i_imageFile, const int i_imageFd, void* io_image, 
        int i_argc, const char** i_argv)
@@ -813,8 +819,7 @@ append(const char* i_imageFile, const int i_imageFd, void* io_image,
         }
         section = i_argv[0];
         file = i_argv[1];
-
-
+        
         // Translate the section name to a section Id
 
         for (sectionId = 0; sectionId < SBE_XIP_SECTIONS; sectionId++) {
@@ -919,6 +924,95 @@ append(const char* i_imageFile, const int i_imageFd, void* io_image,
 
     return rc;
 }
+
+// Extract section from a file
+int
+extract(const char* i_imageFile, const int i_imageFd, void* io_image, 
+        int i_argc, const char** i_argv)
+{
+    int fileFd, newImageFd, sectionId, rc;
+    void* newImage;
+    const char* section;
+    const char* file;
+    struct stat buf;
+    SbeXipHeader header;
+    SbeXipSection* xSection;
+    uint32_t size;
+    uint32_t offset;
+    unsigned int i;
+
+    do {
+
+        if (i_argc != 2) {
+            fprintf(stderr, g_usage);
+            exit(1);
+        }
+        section = i_argv[0];
+        file = i_argv[1];
+
+        printf("%s %s\n", section , file);
+
+        for (sectionId = 0; sectionId < SBE_XIP_SECTIONS; sectionId++) {
+            if (strcmp(section, g_sectionNames[sectionId]) == 0) {
+                break;
+            }
+        }
+        if (sectionId == SBE_XIP_SECTIONS) {
+            fprintf(stderr, "Unrecognized section name : '%s;\n",
+                    section);
+            exit(1);
+        }
+
+        sbe_xip_translate_header(&header, (SbeXipHeader*)io_image);
+
+        for (i = 0; i < SBE_XIP_SECTIONS; i++) {
+            xSection = &(header.iv_section[i]);
+            
+            if (strcmp(section, g_sectionNames[i]) == 0) {
+              
+                size = xSection->iv_size;
+                offset = xSection->iv_offset;
+
+                printf("%-16s 0x%08x 0x%08x (%d)\n",
+                       g_sectionNames[i], 
+                       xSection->iv_offset, xSection->iv_size, xSection->iv_size);
+                
+                break;
+            }
+        }
+
+        newImage = malloc(size);
+
+        if (newImage == 0) {
+            fprintf(stderr, "Can't malloc() a buffer for the new image\n");
+            exit(1);
+        }
+
+        memcpy(newImage, (void*)((uint64_t)io_image + offset), size);
+
+        fileFd = open(file, O_CREAT | O_WRONLY | O_TRUNC, 0755);
+        if (fileFd < 0) {
+            perror("open() of the fixed section : ");
+            exit(1);
+        }
+
+        rc = write(fileFd, newImage, size);
+        if ((rc < 0) || ((uint32_t)rc != size)) {
+            perror("write() of fixed section : ");
+            exit(1);
+        }
+
+        rc = close(fileFd);
+        if (rc) {
+            perror("close() of fixed section : ");
+            exit(1);
+        }
+
+    } while (0);
+
+    return rc;
+
+}
     
 
 // Delete 0 or more sections in order.  
@@ -1923,6 +2017,11 @@ command(const char* i_imageFile, const int i_argc, const char** i_argv, const ui
         openAndMapWritable(i_imageFile, &fd, &image, i_maskIgnores);
         rc = append(i_imageFile, fd, image, i_argc - 1, &(i_argv[1]));
 
+    } else if (strcmp(i_argv[0], "extract") == 0) {
+
+        openAndMapWritable(i_imageFile, &fd, &image, i_maskIgnores);
+        rc = extract(i_imageFile, fd, image, i_argc - 1, &(i_argv[1]));
+
     } else if (strcmp(i_argv[0], "delete") == 0) {
 
         openAndMapWritable(i_imageFile, &fd, &image, i_maskIgnores);
diff --git a/tools/scripts/core_attributes.xml b/tools/scripts/core_attributes.xml
deleted file mode 100644
index 8855ffa8..00000000
--- a/tools/scripts/core_attributes.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- $Id: proc_pll_ring_attributes.xml,v 1.17 2014/11/13 20:14:02 szhong Exp $ -->
-<!-- proc_pll_ring_attributes.xml -->
-<attributes>
-  <attribute>
-    <id>ATTR_CORE_REPR_RING</id>
-    <targetType>TARGET_TYPE_CORE</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <writeable/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_CORE_TIME_RING</id>
-    <targetType>TARGET_TYPE_CORE</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <writeable/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_CORE_GPTR_RING</id>
-    <targetType>TARGET_TYPE_CORE</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <writeable/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-</attributes>
diff --git a/tools/scripts/eq_attributes.xml b/tools/scripts/eq_attributes.xml
deleted file mode 100644
index 36c0c03a..00000000
--- a/tools/scripts/eq_attributes.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- $Id: proc_pll_ring_attributes.xml,v 1.17 2014/11/13 20:14:02 szhong Exp $ -->
-<!-- proc_pll_ring_attributes.xml -->
-<attributes>
-  <attribute>
-    <id>ATTR_DPLL_RING</id>
-    <targetType>TARGET_TYPE_EQ</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-</attributes>
diff --git a/tools/scripts/ex_attributes.xml b/tools/scripts/ex_attributes.xml
deleted file mode 100644
index 98dbfefc..00000000
--- a/tools/scripts/ex_attributes.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!-- $Id: proc_pll_ring_attributes.xml,v 1.17 2014/11/13 20:14:02 szhong Exp $ -->
-<!-- proc_pll_ring_attributes.xml -->
-<attributes>
-  <attribute>
-    <id>ATTR_L2_REPR_RING</id>
-    <targetType>TARGET_TYPE_EX</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_L2_TIME_RING</id>
-    <targetType>TARGET_TYPE_EX</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_L2_GPTR_RING</id>
-    <targetType>TARGET_TYPE_EX</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-  <attribute>
-    <id>ATTR_L3_REPR_RING</id>
-    <targetType>TARGET_TYPE_EX</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_L3_TIME_RING</id>
-    <targetType>TARGET_TYPE_EX</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_L3_GPTR_RING</id>
-    <targetType>TARGET_TYPE_EX</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-</attributes>
diff --git a/tools/scripts/p9_ppe_attributes.xml b/tools/scripts/p9_ppe_attributes.xml
deleted file mode 100644
index b119dc26..00000000
--- a/tools/scripts/p9_ppe_attributes.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- $Id: p9_ppe_attributes.xml,v 1.11 2013/11/07 21:51:13 rembold Exp $ -->
-<!-- p9_ppe_attributes.xml -->
-<entries>
-  <!-- ********************************************************************* -->
-  <entry>
-    <name>ATTR_SCRATCH_UINT8_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT8_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT32_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT32_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT64_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT64_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT8_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT8_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT32_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT32_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT64_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT64_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_REPR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_TIME_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_GPTR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_PLL_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_CORE_REPR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_CORE_TIME_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_CORE_GPTR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L2_REPR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L2_TIME_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L2_GPTR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L3_REPR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L3_TIME_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L3_GPTR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_DPLL_RING</name>
-  </entry>
-</entries>
diff --git a/tools/scripts/p9_ppe_attributes1.xml b/tools/scripts/p9_ppe_attributes1.xml
deleted file mode 100644
index b119dc26..00000000
--- a/tools/scripts/p9_ppe_attributes1.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!-- $Id: p9_ppe_attributes.xml,v 1.11 2013/11/07 21:51:13 rembold Exp $ -->
-<!-- p9_ppe_attributes.xml -->
-<entries>
-  <!-- ********************************************************************* -->
-  <entry>
-    <name>ATTR_SCRATCH_UINT8_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT8_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT32_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT32_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT64_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT64_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT8_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT8_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT32_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT32_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT64_1</name>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT64_2</name>
-  </entry>
-  <entry>
-    <name>ATTR_REPR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_TIME_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_GPTR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_PLL_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_CORE_REPR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_CORE_TIME_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_CORE_GPTR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L2_REPR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L2_TIME_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L2_GPTR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L3_REPR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L3_TIME_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_L3_GPTR_RING</name>
-  </entry>
-  <entry>
-    <name>ATTR_DPLL_RING</name>
-  </entry>
-</entries>
diff --git a/tools/scripts/perv_attributes.xml b/tools/scripts/perv_attributes.xml
deleted file mode 100644
index 50c0f835..00000000
--- a/tools/scripts/perv_attributes.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- $Id: proc_pll_ring_attributes.xml,v 1.17 2014/11/13 20:14:02 szhong Exp $ -->
-<!-- proc_pll_ring_attributes.xml -->
-<attributes>
-  <attribute>
-    <id>ATTR_REPR_RING</id>
-    <targetType>TARGET_TYPE_PERV</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_TIME_RING</id>
-    <targetType>TARGET_TYPE_PERV</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_GPTR_RING</id>
-    <targetType>TARGET_TYPE_PERV</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_PLL_RING</id>
-    <targetType>TARGET_TYPE_PERV</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-</attributes>
diff --git a/tools/scripts/ppe_attributes.xml b/tools/scripts/ppe_attributes.xml
deleted file mode 100644
index 519dd321..00000000
--- a/tools/scripts/ppe_attributes.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!-- $Id: p9_ppe_attributes.xml,v 1.11 2013/11/07 21:51:13 rembold Exp $ -->
-<!-- p9_ppe_attributes.xml -->
-<entries>
-  <!-- ********************************************************************* -->
-  <entry>
-    <name>ATTR_SCRATCH_UINT8_1</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT8_2</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT32_1</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT32_2</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT64_1</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_UINT64_2</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT8_1</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT8_2</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT32_1</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT32_2</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT64_1</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_SCRATCH_INT64_2</name>
-    <file>proc_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_REPR_RING</name>
-    <file>perv_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_TIME_RING</name>
-    <file>perv_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_GPTR_RING</name>
-    <file>perv_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_PLL_RING</name>
-    <file>perv_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_CORE_REPR_RING</name>
-    <file>core_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_CORE_TIME_RING</name>
-    <file>core_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_CORE_GPTR_RING</name>
-    <file>core_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_L2_REPR_RING</name>
-    <file>ex_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_L2_TIME_RING</name>
-    <file>ex_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_L2_GPTR_RING</name>
-    <file>ex_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_L3_REPR_RING</name>
-    <file>ex_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_L3_TIME_RING</name>
-    <file>ex_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_L3_GPTR_RING</name>
-    <file>ex_attributes.xml</file>
-  </entry>
-  <entry>
-    <name>ATTR_DPLL_RING</name>
-    <file>eq_attributes.xml</file>
-  </entry>
-</entries>
diff --git a/tools/scripts/proc_attributes.xml b/tools/scripts/proc_attributes.xml
deleted file mode 100644
index 4273a93f..00000000
--- a/tools/scripts/proc_attributes.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!-- $Id: proc_pll_ring_attributes.xml,v 1.17 2014/11/13 20:14:02 szhong Exp $ -->
-<!-- proc_attributes.xml -->
-<attributes>
-  <attribute>
-    <id>ATTR_SCRATCH_UINT8_1</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>uint8</valueType>
-    <platInit/>
-    <writeable/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_UINT8_2</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>uint8</valueType>
-    <platInit/>
-    <writeable/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_UINT32_1</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_UINT32_2</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>uint32</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_UINT64_1</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>uint64</valueType>
-    <platInit/>
-    <writeable/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_UINT64_2</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>uint64</valueType>
-     <enum>VAL_A = 0, VAL_B = 5, VAL_C = 0xffffffffffffffff</enum>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SIGNED_TEST_8</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>int8</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SIGNED_TEST_64</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>int64</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-  <attribute>
-    <id>ATTR_SCRATCH_INT8_1</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>int8</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_INT8_2</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>int8</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_INT32_1</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>int32</valueType>
-    <platInit/>
-    <writeable/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_INT32_2</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>int32</valueType>
-    <platInit/>
-    <writeable/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_INT64_1</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>int64</valueType>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-   <attribute>
-    <id>ATTR_SCRATCH_INT64_2</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-    </description>
-    <valueType>int64</valueType>
-    <enum>VAL_A = 0, VAL_B = 5, VAL_C = 0xffffffffffffffff</enum>
-    <platInit/>
-    <persistRuntime/>
-  </attribute>
-  <!-- ********************************************************************* -->
-</attributes>