4 files changed, 52 insertions, 6 deletions

diff --git a/src/build/simics/post_model_hook.simics b/src/build/simics/post_model_hook.simics
index 46bfc478d..976cdf1dd 100755
--- a/src/build/simics/post_model_hook.simics
+++ b/src/build/simics/post_model_hook.simics
@@ -36,3 +36,4 @@ run-python-file hb-simdebug.py
 #This will be merged into once the proper tools are written.
 phys_mem.load-file ../img/hbicore_extended.bin 0x500690
 phys_mem.load-file ../img/pnor.toc 0x500000
+phys_mem.load-file ../img/targeting.bin 0x57E690
diff --git a/src/build/tocgen/mkpnortoc.pl b/src/build/tocgen/mkpnortoc.pl
index f4e5464f5..7fc263a72 100755
--- a/src/build/tocgen/mkpnortoc.pl
+++ b/src/build/tocgen/mkpnortoc.pl
@@ -1,4 +1,26 @@
 #!/usr/bin/perl
+#  IBM_PROLOG_BEGIN_TAG
+#  This is an automatically generated prolog.
+#
+#  $Source: src/build/tocgen/mkpnortoc.pl $
+#
+#  IBM CONFIDENTIAL
+#
+#  COPYRIGHT International Business Machines Corp. 2011
+#
+#  p1
+#
+#  Object Code Only (OCO) source materials
+#  Licensed Internal Code Source Materials
+#  IBM HostBoot Licensed Internal Code
+#
+#  The source code for this program is not published or other-
+#  wise divested of its trade secrets, irrespective of what has
+#  been deposited with the U.S. Copyright Office.
+#
+#  Origin: 30
+#
+#  IBM_PROLOG_END
 # File mkPnorTOC.pl created by ADAM R. MUHLE at 14:39:27 on Mon Aug  1 2011.
 
 #Limitations to address later
@@ -65,8 +87,8 @@ $onlytocVerNode = $tocVerNodes->pop();
 writeElementToBinFile(BIN_TOC_FILE, $onlytocVerNode);
 
 
-#Add the individual TOC entries
-$root = $doc->firstChild;
+#Add the individual TOC entries; skip over the mandatory comment block
+$root = $doc->firstChild->nextSibling;
 $curSibling = $root->firstChild;
 
 do {
@@ -85,7 +107,7 @@ do {
 	#skip these, already inserted above
     }
 
-}while($curSibling = $curSibling->nextSibling);
+}while($curSibling = $curSibling->nextSibling());
 
 
 close(BIN_TOC_FILE);
diff --git a/src/build/tocgen/pnortoc.xml b/src/build/tocgen/pnortoc.xml
index 2f530bdb6..06abc67c1 100644
--- a/src/build/tocgen/pnortoc.xml
+++ b/src/build/tocgen/pnortoc.xml
@@ -1,3 +1,25 @@
+<!--  IBM_PROLOG_BEGIN_TAG
+     This is an automatically generated prolog.
+   
+     $Source: src/build/tocgen/pnortoc.xml $
+   
+     IBM CONFIDENTIAL
+   
+     COPYRIGHT International Business Machines Corp. 2011
+   
+     p1
+   
+     Object Code Only (OCO) source materials
+     Licensed Internal Code Source Materials
+     IBM HostBoot Licensed Internal Code
+   
+     The source code for this program is not published or other-
+     wise divested of its trade secrets, irrespective of what has
+     been deposited with the U.S. Copyright Office.
+   
+     Origin: 30
+   
+     IBM_PROLOG_END -->
 <pnorToc>
     <sbeLoc>0x180
         <length>8</length>
@@ -114,11 +136,11 @@
             <length>8</length>
             <format>number</format>
         </field>
-        <field type="logical_size">8192
+        <field type="logical_size">16384
             <length>8</length>
             <format>number</format>
         </field>
-        <field type="physical_size">8192
+        <field type="physical_size">16384
             <length>8</length>
             <format>number</format>
         </field>
diff --git a/src/build/tools/cpfiles.pl b/src/build/tools/cpfiles.pl
index 682a6b9f7..222c406d2 100755
--- a/src/build/tools/cpfiles.pl
+++ b/src/build/tools/cpfiles.pl
@@ -68,7 +68,8 @@ my @files = ("src/build/tools/exthbdump.pl",
              "img/hbicore_test.list",
              "img/hbicore_extended.bin",
              "img/hbicore_test_extended.bin",
-             "img/pnor.toc"
+             "img/pnor.toc",
+             "img/targeting.bin",
              );
 
 #Directories in base git repository