summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--importtemp/xml/attribute_info/core_attributes.xml (renamed from tools/scripts/core_attributes.xml)0
-rw-r--r--importtemp/xml/attribute_info/eq_attributes.xml (renamed from tools/scripts/eq_attributes.xml)0
-rw-r--r--importtemp/xml/attribute_info/ex_attributes.xml (renamed from tools/scripts/ex_attributes.xml)0
-rw-r--r--importtemp/xml/attribute_info/perv_attributes.xml (renamed from tools/scripts/perv_attributes.xml)0
-rw-r--r--importtemp/xml/attribute_info/proc_attributes.xml (renamed from tools/scripts/proc_attributes.xml)0
-rw-r--r--importtemp/xml/error_info/.empty0
-rw-r--r--importtemp/xml/p9_ppe_attributes.xml (renamed from tools/scripts/p9_ppe_attributes.xml)10
-rw-r--r--sbe/image/Makefile43
-rw-r--r--sbe/image/img_defs.mk4
-rwxr-xr-x[-rw-r--r--]tools/image/ppeSetFixed.pl120
-rw-r--r--tools/image/sbe_xip_tool.c105
-rw-r--r--tools/scripts/p9_ppe_attributes1.xml83
-rw-r--r--tools/scripts/ppe_attributes.xml109
13 files changed, 209 insertions, 265 deletions
diff --git a/tools/scripts/core_attributes.xml b/importtemp/xml/attribute_info/core_attributes.xml
index 8855ffa8..8855ffa8 100644
--- a/tools/scripts/core_attributes.xml
+++ b/importtemp/xml/attribute_info/core_attributes.xml
diff --git a/tools/scripts/eq_attributes.xml b/importtemp/xml/attribute_info/eq_attributes.xml
index 36c0c03a..36c0c03a 100644
--- a/tools/scripts/eq_attributes.xml
+++ b/importtemp/xml/attribute_info/eq_attributes.xml
diff --git a/tools/scripts/ex_attributes.xml b/importtemp/xml/attribute_info/ex_attributes.xml
index 98dbfefc..98dbfefc 100644
--- a/tools/scripts/ex_attributes.xml
+++ b/importtemp/xml/attribute_info/ex_attributes.xml
diff --git a/tools/scripts/perv_attributes.xml b/importtemp/xml/attribute_info/perv_attributes.xml
index 50c0f835..50c0f835 100644
--- a/tools/scripts/perv_attributes.xml
+++ b/importtemp/xml/attribute_info/perv_attributes.xml
diff --git a/tools/scripts/proc_attributes.xml b/importtemp/xml/attribute_info/proc_attributes.xml
index 4273a93f..4273a93f 100644
--- a/tools/scripts/proc_attributes.xml
+++ b/importtemp/xml/attribute_info/proc_attributes.xml
diff --git a/importtemp/xml/error_info/.empty b/importtemp/xml/error_info/.empty
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/importtemp/xml/error_info/.empty
diff --git a/tools/scripts/p9_ppe_attributes.xml b/importtemp/xml/p9_ppe_attributes.xml
index b119dc26..34679d04 100644
--- a/tools/scripts/p9_ppe_attributes.xml
+++ b/importtemp/xml/p9_ppe_attributes.xml
@@ -4,6 +4,7 @@
<!-- ********************************************************************* -->
<entry>
<name>ATTR_SCRATCH_UINT8_1</name>
+ <value>0x8</value>
</entry>
<entry>
<name>ATTR_SCRATCH_UINT8_2</name>
@@ -13,6 +14,7 @@
</entry>
<entry>
<name>ATTR_SCRATCH_UINT32_2</name>
+ <value>0xaffeaffe</value>
</entry>
<entry>
<name>ATTR_SCRATCH_UINT64_1</name>
@@ -40,12 +42,16 @@
</entry>
<entry>
<name>ATTR_REPR_RING</name>
+ <value>0xcafe</value>
+ <value>0xaffe</value>
</entry>
<entry>
<name>ATTR_TIME_RING</name>
</entry>
<entry>
<name>ATTR_GPTR_RING</name>
+ <value>0xcafe</value>
+ <value>0xaffe</value>
</entry>
<entry>
<name>ATTR_PLL_RING</name>
@@ -64,6 +70,8 @@
</entry>
<entry>
<name>ATTR_L2_TIME_RING</name>
+ <value>0xcafe</value>
+ <value>0xaffe</value>
</entry>
<entry>
<name>ATTR_L2_GPTR_RING</name>
@@ -73,6 +81,8 @@
</entry>
<entry>
<name>ATTR_L3_TIME_RING</name>
+ <value>0xcafe</value>
+ <value>0xaffe</value>
</entry>
<entry>
<name>ATTR_L3_GPTR_RING</name>
diff --git a/sbe/image/Makefile b/sbe/image/Makefile
index 13e142bc..2b90d774 100644
--- a/sbe/image/Makefile
+++ b/sbe/image/Makefile
@@ -117,39 +117,38 @@ $(OBJDIR)/$(IMAGE_SBE_NAME).out: $(LINK_OBJS) $(LINK_SCRIPT_SBE)
$(LINK_SCRIPT_SBE): linksbe.cmd
$(CPP) -E -x c++ -P $(DEFS) linksbe.cmd -o $(LINK_SCRIPT_SBE)
-
-all: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(SBE_TOOLS) normalize $(OBJDIR)/fixed.bin
+all: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(SBE_TOOLS) normalize defaultset $(OBJDIR)/fixed.bin
#Create an obj directory if needed
$(LINK_OBJS) $(OBJS) $(OBJS:.o=.d): | $(OBJDIR)
+ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/perv_attributes.xml
+ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/proc_attributes.xml
+ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/ex_attributes.xml
+ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/eq_attributes.xml
+ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/core_attributes.xml
+
$(OBJDIR):
- $(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(TOOLS_ATTR_DIR)/p9_ppe_attributes1.xml $(ATTRFILES)
- $(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PPE_FAPI2_DIR)/include $(TOOLS_ATTR_DIR)/p9_ppe_attributes1.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(IMPORT_XML_DIR)/p9_ppe_attributes.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PPE_FAPI2_DIR)/include $(IMPORT_XML_DIR)/p9_ppe_attributes.xml $(ATTRFILES)
$(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl -path $(TOOLS_ATTR_DIR)/src -inc $(PPE_FAPI2_DIR)/include -src $(PPE_FAPI2_DIR)/src
- $(TOOLS_ATTR_DIR)/ppeCreateIfAttrService.pl $(PPE_FAPI2_DIR)/include $(TOOLS_ATTR_DIR)/p9_ppe_attributes1.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeCreateIfAttrService.pl $(PPE_FAPI2_DIR)/include $(IMPORT_XML_DIR)/p9_ppe_attributes.xml $(ATTRFILES)
mkdir -p $(OBJDIR)
.PHONY: clean topfixedheaders $(PKLIB) $(P2PLIB) $(PPELIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(PERVLIB) $(HWPLIB)
-ATTRFILES += $(TOOLS_ATTR_DIR)/perv_attributes.xml
-ATTRFILES += $(TOOLS_ATTR_DIR)/proc_attributes.xml
-ATTRFILES += $(TOOLS_ATTR_DIR)/ex_attributes.xml
-ATTRFILES += $(TOOLS_ATTR_DIR)/eq_attributes.xml
-ATTRFILES += $(TOOLS_ATTR_DIR)/core_attributes.xml
-
topfixedheaders:
- $(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(TOOLS_ATTR_DIR)/p9_ppe_attributes1.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(IMPORT_XML_DIR)/p9_ppe_attributes.xml $(ATTRFILES)
attrids:
- $(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PPE_FAPI2_DIR)/include $(TOOLS_ATTR_DIR)/p9_ppe_attributes1.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PPE_FAPI2_DIR)/include $(IMPORT_XML_DIR)/p9_ppe_attributes.xml $(ATTRFILES)
platattr:
$(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(TOOLS_ATTR_DIR)/src --inc $(PPE_FAPI2_DIR)/include --src $(PPE_FAPI2_DIR)/src
attrserv:
- $(TOOLS_ATTR_DIR)/ppeCreateIfAttrService.pl $(PPE_FAPI2_DIR)/include $(TOOLS_ATTR_DIR)/p9_ppe_attributes1.xml $(ATTRFILES)
+ $(TOOLS_ATTR_DIR)/ppeCreateIfAttrService.pl $(PPE_FAPI2_DIR)/include $(IMPORT_XML_DIR)/p9_ppe_attributes.xml $(ATTRFILES)
#Build macro-specific kernel code
@@ -205,8 +204,14 @@ $(SBE_TOOLS):
normalize: $(SBE_TOOLS) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin
$(TOOLS_IMAGE_DIR)/sbe_xip_tool $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin normalize
-$(OBJDIR)/fixed.bin: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out
- /afs/bb/proj/cte/tools/ppetools/prod/powerpc-eabi/bin/objcopy -O binary --only-section=.fixed $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(OBJDIR)/fixed.bin
+defaultset: $(SBE_TOOLS) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin normalize
+ $(TOOLS_IMAGE_DIR)/ppeSetFixed.pl $(TOOLS_IMAGE_DIR) $(BASE_OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(IMPORT_XML_DIR)/p9_ppe_attributes.xml $(ATTRFILES)
+
+
+$(OBJDIR)/fixed.bin: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin
+ $(TOOLS_IMAGE_DIR)/sbe_xip_tool $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin extract .fixed $(BASE_OBJDIR)/fixed.bin
+
+#/afs/bb/proj/cte/tools/ppetools/prod/powerpc-eabi/bin/objcopy -O binary --only-section=.fixed $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(OBJDIR)/fixed.bin
# collect all of the trace hash files for this image into a single trexStringFile
.PHONY : tracehash
@@ -225,16 +230,16 @@ dump:
objdump -s $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out > $(IMAGE_SEEPROM_NAME).dump
# load and run the SBE image in a GPE simics environment
-run: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out
+runseeprom: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out
$(SIMICS_WS)/simics \
-e '$$occ_gpe0_binary_to_load=$(OBJDIR)/$(IMAGE_SEEPROM_NAME).out' modelsetup.simics
# load and run the SBE image in a GPE simics environment
-run: $(OBJDIR)/$(IMAGE_NAME).out
+runsbe: $(OBJDIR)/$(IMAGE_SBE_NAME).out
$(SIMICS_WS)/simics \
- -e '$$occ_gpe0_binary_to_load=$(OBJDIR)/$(IMAGE_NAME).out' modelsetup.simics
+ -e '$$occ_gpe0_binary_to_load=$(OBJDIR)/$(IMAGE_SBE_NAME).out' modelsetup.simics
diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk
index 0ce1d2e6..2e96b86b 100644
--- a/sbe/image/img_defs.mk
+++ b/sbe/image/img_defs.mk
@@ -78,6 +78,10 @@ ifndef TOOLS_IMAGE_DIR
export TOOLS_IMAGE_DIR = $(abspath ../../tools/image)
endif
+ifndef IMPORT_XML_DIR
+export IMPORT_XML_DIR = $(abspath ../../importtemp/xml)
+endif
+
ifndef P2P_SRCDIR
export P2P_SRCDIR = $(abspath ../../tools/PowerPCtoPPE)
endif
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/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/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>
OpenPOWER on IntegriCloud