Process MRW MC Targets Correctly

  - Use the processMc function that finds the correct
    child target types

Change-Id: I7945492a5f399a9cad68815d26953aa91aad4a72
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81255
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>

src/usr/targeting/common/Targets.pm

@@ -1956,6 +1956,12 @@ sub processMc
 
                 foreach my $dmi (@{ $self->getTargetChildren($mi) })
                 {
+                    my $child_type = $self->getType($dmi);
+                    if ($child_type ne "DMI")
+                    {
+                        next;
+                    }
+
                     my $dmi_num = $self->getAttribute($dmi, "CHIP_UNIT");
 
                     my $membufnum = $proc * $self->{MAX_DMI} + $dmi_num;
@@ -1982,7 +1988,7 @@ sub processMc
                         my $parent_physical = $self->getAttribute($membuf, "PHYS_PATH");
 
                         $self->setAttribute($membuf,"FAPI_NAME",
-                                     $self->getFapiName($membuf_type, $node, $membufnum));
+                                     $self->getFapiName($membuf_type, $node, $membufnum, $memCardOffset));
 
                         my $fapi_pos = (($node * $maxInstance{"PROC"}) + $proc ) * $self->{MAX_DMI} + $dmi_num;