Make Hostboot-Extended 1MB in size.

Change-Id: I2e59c8bab9d848a5ca0395e993fd405851a44d06
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/634
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 26 insertions, 26 deletions

diff --git a/src/build/simics/post_model_hook.simics b/src/build/simics/post_model_hook.simics
index 292a7a9ac..0df0206b3 100755
--- a/src/build/simics/post_model_hook.simics
+++ b/src/build/simics/post_model_hook.simics
@@ -37,5 +37,5 @@ 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 0x5B0690
+phys_mem.load-file ../img/targeting.bin 0x601690
 
diff --git a/src/build/tocgen/pnortoc.xml b/src/build/tocgen/pnortoc.xml
index df2d889c2..f99595c40 100644
--- a/src/build/tocgen/pnortoc.xml
+++ b/src/build/tocgen/pnortoc.xml
@@ -74,11 +74,11 @@
             <length>8</length>
             <format>number</format>
         </field>
-        <field type="logical_size">0xAF000
+        <field type="logical_size">0x100000
             <length>8</length>
             <format>number</format>
         </field>
-        <field type="physical_size">0xAF000
+        <field type="physical_size">0x100000
             <length>8</length>
             <format>number</format>
         </field>
@@ -97,11 +97,11 @@
             <length>8</length>
             <format>string</format>
         </field>
-        <field type="logical_offset">0xAF690
+        <field type="logical_offset">0x100690
             <length>8</length>
             <format>number</format>
         </field>
-        <field type="physical_offset">0xAF690
+        <field type="physical_offset">0x100690
             <length>8</length>
             <format>number</format>
         </field>
@@ -128,11 +128,11 @@
             <length>8</length>
             <format>string</format>
     	</field>
-        <field type="logical_offset">0xB0690
+        <field type="logical_offset">0x101690
             <length>8</length>
             <format>number</format>
         </field>
-        <field type="physical_offset">0xB0690
+        <field type="physical_offset">0x101690
             <length>8</length>
             <format>number</format>
         </field>
diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C
index 0c11032dd..e6987d553 100644
--- a/src/usr/pnor/pnorrp.C
+++ b/src/usr/pnor/pnorrp.C
@@ -329,7 +329,7 @@ errlHndl_t PnorRP::readTOC()
 
     // put some random sizes in here
     iv_TOC[PNOR::SIDE_A][PNOR::TOC].size = 8 + 8 + PNOR::NUM_SECTIONS*sizeof(TOCEntry_t);
-    iv_TOC[PNOR::SIDE_A][PNOR::HB_EXT_CODE].size = 700*KILOBYTE; //700K
+    iv_TOC[PNOR::SIDE_A][PNOR::HB_EXT_CODE].size = 1024*KILOBYTE; //1MB
     iv_TOC[PNOR::SIDE_A][PNOR::GLOBAL_DATA].size = PAGESIZE; //4K
     iv_TOC[PNOR::SIDE_A][PNOR::HB_DATA].size = 512*KILOBYTE; //512K
 
diff --git a/src/usr/pnor/test/pnorrptest.H b/src/usr/pnor/test/pnorrptest.H
index f04b7ecc0..343b7bdb7 100644
--- a/src/usr/pnor/test/pnorrptest.H
+++ b/src/usr/pnor/test/pnorrptest.H
@@ -64,13 +64,13 @@ class PnorRpTest : public CxxTest::TestSuite
         };
         const ExpVals_t exp_data[] = {
             /* TOC */ { 0x690, 0x80000000 },
-            /* GLOBAL_DATA */ { PAGESIZE, 0x800AF690 },
+            /* GLOBAL_DATA */ { PAGESIZE, 0x80100690 },
             /* SBE_IPL */ { 0, 0 },
             /* HB_BASE_CODE */ { 0, 0 },
-            /* HB_DATA */ { 512*KILOBYTE, 0x800B0690 },
+            /* HB_DATA */ { 512*KILOBYTE, 0x80101690 },
             /* HB_ERRLOGS */ { 0, 0 },
-            /* HB_EXT_CODE */ { 0xAF000, 0x80000690 },
-            /* HB_RUNTIME */ { 0, 0 }, 
+            /* HB_EXT_CODE */ { 1024*KILOBYTE, 0x80000690 },
+            /* HB_RUNTIME */ { 0, 0 },
             /* PAYLOAD */ { 0, 0 },
             /* PFW_LITE_CODE */ { 0, 0 },
             /* OCC_CODE */ { 0, 0 },
@@ -107,7 +107,7 @@ class PnorRpTest : public CxxTest::TestSuite
                 TS_FAIL( "PnorRpTest::test_getSectionInfo> ERROR : Mismatched Size" );
                 fails++;
             }
-           
+
             // Look for expected vaddr
             total++;
             if( info.vaddr != exp_data[id].vaddr )
@@ -118,7 +118,7 @@ class PnorRpTest : public CxxTest::TestSuite
             }
         }
 
-        
+
         TRACFCOMP(g_trac_pnor, "PnorRpTest::test_getSectionInfo> %d/%d fails", fails, total );
     };
 
@@ -135,7 +135,7 @@ class PnorRpTest : public CxxTest::TestSuite
         int rc = 0;
 
         msg_q_t mq = PnorRP::getInstance().iv_msgQ;
-        
+
 
         // allocate some space to play with
         uint64_t data1_r[PAGESIZE/sizeof(uint64_t)];
@@ -148,7 +148,7 @@ class PnorRpTest : public CxxTest::TestSuite
 
         msg_t* msg = msg_allocate();
 
-        // read the first page        
+        // read the first page
         total++;
         msg->type = MSG_MM_RP_READ;
         msg->data[1] = (uint64_t)data1_r; //data[1] = address to copy into (user buffer)
@@ -158,7 +158,7 @@ class PnorRpTest : public CxxTest::TestSuite
         {
             TRACFCOMP(g_trac_pnor, "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(READ):1" );
             TS_FAIL( "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(READ):1, rc=%d", rc );
-            fails++;            
+            fails++;
         }
 
         // read the second page
@@ -171,7 +171,7 @@ class PnorRpTest : public CxxTest::TestSuite
         {
             TRACFCOMP(g_trac_pnor, "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(READ):2" );
             TS_FAIL( "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(READ):2, rc=%d", rc );
-            fails++;            
+            fails++;
         }
 
         // put some data into the first page
@@ -190,7 +190,7 @@ class PnorRpTest : public CxxTest::TestSuite
         {
             TRACFCOMP(g_trac_pnor, "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(WRITE):1" );
             TS_FAIL( "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(WRITE):1, rc=%d", rc );
-            fails++;            
+            fails++;
         }
 
         // read the first page again
@@ -203,7 +203,7 @@ class PnorRpTest : public CxxTest::TestSuite
         {
             TRACFCOMP(g_trac_pnor, "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(READ):3" );
             TS_FAIL( "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(READ):3, rc=%d", rc );
-            fails++;            
+            fails++;
         }
 
         // compare to what we wrote
@@ -212,7 +212,7 @@ class PnorRpTest : public CxxTest::TestSuite
         {
             TRACFCOMP(g_trac_pnor, "PnorRpTest::test_messageReadWrite> ERROR : Data mismatch in page0" );
             TS_FAIL( "PnorRpTest::test_messageReadWrite> ERROR : Data mismatch in page0" );
-            fails++;            
+            fails++;
             uint64_t* act_data = data1_r;
             for( uint64_t x = 0; x < 4; x++ )
             {
@@ -231,7 +231,7 @@ class PnorRpTest : public CxxTest::TestSuite
         {
             TRACFCOMP(g_trac_pnor, "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(READ):4" );
             TS_FAIL( "PnorRpTest::test_messageReadWrite> ERROR : error from msg_sendrecv(READ):4, rc=%d", rc );
-            fails++;            
+            fails++;
         }
 
         // compare to what we read the first time
@@ -240,7 +240,7 @@ class PnorRpTest : public CxxTest::TestSuite
         {
             TRACFCOMP(g_trac_pnor, "PnorRpTest::test_messageReadWrite> ERROR : Data mismatch in page1" );
             TS_FAIL( "PnorRpTest::test_messageReadWrite> ERROR : Data mismatch in page1" );
-            fails++;            
+            fails++;
             uint64_t* act_data = data_tmp;
             for( uint64_t x = 0; x < 4; x++ )
             {
@@ -260,7 +260,7 @@ class PnorRpTest : public CxxTest::TestSuite
      */
     void test_AddrReadWrite(void)
     {
-        return; //@todo - enable this after Task 3445 
+        return; //@todo - enable this after Task 3445
         TRACFCOMP( g_trac_pnor, "PnorRpTest::test_AddrReadWrite> Start" );
         uint64_t fails = 0;
         uint64_t total = 0;
@@ -277,7 +277,7 @@ class PnorRpTest : public CxxTest::TestSuite
             memcpy( ptr, (void*)(0x80000000+addr), 16*sizeof(uint64_t) );
         }
         delete[] ptr;
-        
+
         // setup a bunch of interesting addresses to read/write from
         uint64_t test_addrs[] = {
             0x8007E690,  // chip0-HB_DATA
@@ -327,7 +327,7 @@ class PnorRpTest : public CxxTest::TestSuite
     //@todo - import config data from build and compare to section info
 
 
-};     
+};
 
 
 #endif