From bfc1a5511eb003271517efa15908f02527be4dff Mon Sep 17 00:00:00 2001
From: Andrew Geissler <andrewg@us.ibm.com>
Date: Tue, 2 Apr 2013 14:03:07 -0500
Subject: Support multi-core in standalone and move to new build.

Change-Id: I5e69a15be0117b007dc343fcba5fa7e1493331fc
RTC: 68317
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3841
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/usr/targeting/namedtarget.C |  6 +++---
 src/usr/vpd/makefile            |  2 +-
 src/usr/vpd/test/mvpdtest.H     | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/usr')

diff --git a/src/usr/targeting/namedtarget.C b/src/usr/targeting/namedtarget.C
index df67777f8..7784ddf30 100644
--- a/src/usr/targeting/namedtarget.C
+++ b/src/usr/targeting/namedtarget.C
@@ -70,8 +70,8 @@ const TARGETING::Target *   getMasterCore( )
                       true );
 
     TRACDCOMP( g_trac_targeting,
-               "getMasterCore: found %d cores on master proc",
-               l_cores.size()   );
+               "getMasterCore: found %d cores on master proc, l_mastreCoreID:0x%X",
+               l_cores.size(),l_masterCoreID   );
 
     for (TARGETING::TargetHandleList::const_iterator
             coreIter = l_cores.begin();
@@ -88,7 +88,7 @@ const TARGETING::Target *   getMasterCore( )
         pir |= l_logicalNodeId << 10;
 
         if (pir == l_masterCoreID){
-            TRACDCOMP( g_trac_targeting,
+            TRACFCOMP( g_trac_targeting,
                        "found master core: 0x%x, PIR=0x%x :",
                        l_coreId,
                        pir  );
diff --git a/src/usr/vpd/makefile b/src/usr/vpd/makefile
index 38adc2ea1..db17207a6 100644
--- a/src/usr/vpd/makefile
+++ b/src/usr/vpd/makefile
@@ -28,7 +28,7 @@ OBJS = vpd.o spd.o ipvpd.o mvpd.o dimmPres.o cvpd.o
 SUBDIRS = test.d
 
 BINARY_FILES = $(IMGDIR)/dimmspd.dat:9a6e6b6a7f6d3fc77a12d38537279d402124d699
-BINARY_FILES += $(IMGDIR)/procmvpd.dat:dc85f0e2f7b26f3928c817be3f0c37a9cc0e0bed
+BINARY_FILES += $(IMGDIR)/procmvpd.dat:9473e24c02c40a577700ae0292676c4b82698c13
 BINARY_FILES += $(IMGDIR)/cvpd.dat:199b4db0140c2021c82c73b88d7516dde52a2718
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/vpd/test/mvpdtest.H b/src/usr/vpd/test/mvpdtest.H
index 94faefc58..d40ea22d3 100755
--- a/src/usr/vpd/test/mvpdtest.H
+++ b/src/usr/vpd/test/mvpdtest.H
@@ -74,7 +74,6 @@ mvpdTestData mvpdData[] =
     { MVPD::CP00, MVPD::pdR },
     { MVPD::CP00, MVPD::pdG },
     { MVPD::CP00, MVPD::pdV },
-    { MVPD::CP00, MVPD::pdH },
     //    { MVPD::CP00, pdP }, // no #P in test data
     { MVPD::CP00, MVPD::SB },
     { MVPD::CP00, MVPD::MK },
@@ -89,13 +88,14 @@ mvpdTestData mvpdData[] =
     { MVPD::LRP5, MVPD::pdP },
     { MVPD::LRP5, MVPD::pdM },
     { MVPD::LRP5, MVPD::CH },
-    { MVPD::LRP6, MVPD::VD },
-    { MVPD::LRP6, MVPD::pdV },
-    { MVPD::LRP6, MVPD::pdP },
-    { MVPD::LRP6, MVPD::pdM },
-    { MVPD::LRP6, MVPD::CH },
-    /*         // no LRP7,LRP8,LRP9,LRPA,LRPB,LWPO,LWP1,LWP2,LWP3
+/*
+             // no LRP6, LRP7,LRP8,LRP9,LRPA,LRPB,LWPO,LWP1,LWP2,LWP3
                       in test data
+     { MVPD::LRP6, MVPD::VD },
+     { MVPD::LRP6, MVPD::pdV },
+     { MVPD::LRP6, MVPD::pdP },
+     { MVPD::LRP6, MVPD::pdM },
+     { MVPD::LRP6, MVPD::CH },
      { MVPD::LRP7, VD },
      { MVPD::LRP7, MVPD::pdV },
      { MVPD::LRP7, MVPD::pdP },
@@ -161,11 +161,11 @@ mvpdTestData mvpdData[] =
     { MVPD::LWP5, MVPD::pd2 },
     { MVPD::LWP5, MVPD::pd3 },
     { MVPD::LWP5, MVPD::IN },
-    { MVPD::LWP6, MVPD::VD },
-    { MVPD::LWP6, MVPD::pd2 },
-    { MVPD::LWP6, MVPD::pd3 },
-    { MVPD::LWP6, MVPD::IN },
-    /*                 // no LWP7,LWP8,LWP9,LWPA,LWPB in test data
+    /*                 // no LWP6, LWP7,LWP8,LWP9,LWPA,LWPB in test data
+     { MVPD::LWP6, MVPD::VD },
+     { MVPD::LWP6, MVPD::pd2 },
+     { MVPD::LWP6, MVPD::pd3 },
+     { MVPD::LWP6, MVPD::IN },
      { MVPD::LWP7, MVPD::VD },
      { MVPD::LWP7, MVPD::pd2 },
      { MVPD::LWP7, MVPD::pd3 },
-- 
cgit v1.2.1