summaryrefslogtreecommitdiffstats
path: root/src/build/debug
diff options
context:
space:
mode:
authorDan Crowell <dcrowell@us.ibm.com>2018-08-07 15:28:06 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-08-29 13:39:57 -0500
commitd897f3d7f7c7aed698375a9d9ca9dcb4e3bb64ae (patch)
treeba2e64c23248930d9acf9e7b9892200739e87e29 /src/build/debug
parentfeba8f886228d45211673d32ef8a0be25660b1ff (diff)
downloadtalos-hostboot-d897f3d7f7c7aed698375a9d9ca9dcb4e3bb64ae.tar.gz
talos-hostboot-d897f3d7f7c7aed698375a9d9ca9dcb4e3bb64ae.zip
Fix some shortname issues
MEMPORT is using mp Made all processor-level names generic Change-Id: I50ac5742b20645574ce5bd4636fa23ec39357b96 RTC: 172969 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64065 Tested-by: Jenkins Server <pfd-jenkins+hostboot@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: Christian R. Geddes <crgeddes@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build/debug')
-rwxr-xr-xsrc/build/debug/Hostboot/FapiAttr.pm54
-rwxr-xr-xsrc/build/debug/Hostboot/HwpfAttrOverride.pm4
2 files changed, 29 insertions, 29 deletions
diff --git a/src/build/debug/Hostboot/FapiAttr.pm b/src/build/debug/Hostboot/FapiAttr.pm
index 8598b9c20..0dac8aa69 100755
--- a/src/build/debug/Hostboot/FapiAttr.pm
+++ b/src/build/debug/Hostboot/FapiAttr.pm
@@ -406,40 +406,40 @@ sub cronusTargetStr()
"00000000" => "none",
"00000001" => "sys",
"00000002" => "dimm",
- "00000004" => "p9n",
+ "00000004" => "pu",
"00000008" => "memb",
- "00000010" => "p9n.ex",
- "00000020" => "cen.mba",
- "00000040" => "p9n.mcs",
- "00000080" => "p9n.xbus",
- "00000100" => "p9n.abus",
- "00000200" => "cen.l4",
- "00000400" => "p9n.c",
- "00000800" => "p9n.eq",
- "00001000" => "p9n.mca",
- "00002000" => "p9n.mcbist",
- "00004000" => "p9n.mi",
- "00008000" => "p9n.capp",
- "00010000" => "p9n.dmi",
- "00020000" => "p9n.obus",
- "00040000" => "p9n.nv",
- "00080000" => "p9n.sbe",
- "00100000" => "p9n.ppe",
- "00200000" => "p9n.perv",
- "00400000" => "p9n.pec",
- "00800000" => "p9n.phb",
- "01000000" => "p9n.mc",
- "02000000" => "p9n.omi",
- "04000000" => "p9n.omic",
- "08000000" => "p9n.mcc",
+ "00000010" => "pu.ex",
+ "00000020" => "memb.mba",
+ "00000040" => "pu.mcs",
+ "00000080" => "pu.xbus",
+ "00000100" => "pu.abus",
+ "00000200" => "memb.l4",
+ "00000400" => "pu.c",
+ "00000800" => "pu.eq",
+ "00001000" => "pu.mca",
+ "00002000" => "pu.mcbist",
+ "00004000" => "pu.mi",
+ "00008000" => "pu.capp",
+ "00010000" => "pu.dmi",
+ "00020000" => "pu.obus",
+ "00040000" => "pu.nv",
+ "00080000" => "pu.sbe",
+ "00100000" => "pu.ppe",
+ "00200000" => "pu.perv",
+ "00400000" => "pu.pec",
+ "00800000" => "pu.phb",
+ "01000000" => "pu.mc",
+ "02000000" => "pu.omi",
+ "04000000" => "pu.omic",
+ "08000000" => "pu.mcc",
"10000000" => "ocmb"
- "20000000" => "ocmb.memport"
+ "20000000" => "ocmb.mp"
);
my $cro_type = $types{$targetType_hexstr};
my $cronusTargetStr;
- # System, dimm, p9 and memb have different string
+ # System, dimm, pu and memb have different string
if($cro_type eq "sys")
{
$cronusTargetStr = "target = k0\n";
diff --git a/src/build/debug/Hostboot/HwpfAttrOverride.pm b/src/build/debug/Hostboot/HwpfAttrOverride.pm
index 5016c9845..b567ec02e 100755
--- a/src/build/debug/Hostboot/HwpfAttrOverride.pm
+++ b/src/build/debug/Hostboot/HwpfAttrOverride.pm
@@ -709,10 +709,10 @@ sub main
$targType = TARGET_TYPE_OCMB;
$targ =~ s/^.*ocmb//;
}
- elsif ($targ =~ /ocmb.memport/)
+ elsif ($targ =~ /ocmb.mp/)
{
$targType = TARGET_TYPE_MEM_PORT;
- $targ =~ s/^.*ocmb.memport//;
+ $targ =~ s/^.*ocmb.mp//;
}
# Figure out the position
OpenPOWER on IntegriCloud