FFS Support for Bootloader

This commit moves functionality out of pnor_common.C and puts it in
a new file pnor_utils.C this file will be shared with bootloader and
hostboot code. Quite a few files were pulled apart in order to make
includes easier across modules. These are lpc_const.H and pnor_const.H.
bl_pnorAccess leverages the new pnor_utils.C file that will help the
bootloader parse pnor TOC

Change-Id: I740f6f8a707760756a261535e62e2d0a849324f8
RTC:134064
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/696
Tested-by: Jenkins Server
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

4 files changed, 9 insertions, 10 deletions

diff --git a/src/usr/pnor/runtime/makefile b/src/usr/pnor/runtime/makefile
index 0556af9e4..708d39abb 100644
--- a/src/usr/pnor/runtime/makefile
+++ b/src/usr/pnor/runtime/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -27,6 +27,7 @@ ROOTPATH = ../../../..
 MODULE = pnor_rt
 
 OBJS += rt_pnor.o
+OBJS += pnor_utils.o
 OBJS += pnor_common.o
 OBJS += ecc.o
 
diff --git a/src/usr/pnor/runtime/rt_pnor.C b/src/usr/pnor/runtime/rt_pnor.C
index 28281f4b2..33c1a2439 100644
--- a/src/usr/pnor/runtime/rt_pnor.C
+++ b/src/usr/pnor/runtime/rt_pnor.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -652,11 +652,10 @@ errlHndl_t RtPnor::readTOC ()
                 break;
             }
 
-            // When we ask for TOC partition, Opal returns a valid TOC.
-            // So, we don't need to verify the second TOC in parseTOC
-            // Therefore, sending invalid value for second toc
-            PNOR::TOCS l_tocUsed;
-            l_err = PNOR::parseTOC(l_toc0Buffer, 0, l_tocUsed, iv_TOC, 0);
+            //Pass along TOC buffer to be parsed, parseTOC will parse through
+            // the buffer and store needed information in iv_TOC
+            // Note: that Opal should always return a valid TOC
+            l_err = PNOR::parseTOC(l_toc0Buffer, iv_TOC);
             if (l_err)
             {
                 TRACFCOMP(g_trac_pnor, "RtPnor::readTOC: parseTOC failed");
diff --git a/src/usr/pnor/runtime/test/makefile b/src/usr/pnor/runtime/test/makefile
index e53d87f15..70c7d5276 100644
--- a/src/usr/pnor/runtime/test/makefile
+++ b/src/usr/pnor/runtime/test/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
diff --git a/src/usr/pnor/runtime/test/testpnor_rt.H b/src/usr/pnor/runtime/test/testpnor_rt.H
index 5a81ea9ac..a1a8777e4 100644
--- a/src/usr/pnor/runtime/test/testpnor_rt.H
+++ b/src/usr/pnor/runtime/test/testpnor_rt.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -162,7 +162,6 @@ class PnorRtTest : public CxxTest::TestSuite
                 TS_FAIL("PnorRtTest::testTOC: writeToDevice failed");
             }
         }
-
         delete tocHeader;
         delete tocEntry;
         delete corruptBuffer;