diff options
author | Christian Geddes <crgeddes@us.ibm.com> | 2018-08-03 16:17:23 -0500 |
---|---|---|
committer | William G. Hoffa <wghoffa@us.ibm.com> | 2018-08-08 16:12:57 -0500 |
commit | 7214cd962fb50230d57a30b76b291fd381b85bbd (patch) | |
tree | b37554add1023f4b540d3ac7ede954006c78368c /src | |
parent | ffcc637cd404efcce9ec16bab48f3f50b32fb6a5 (diff) | |
download | talos-hostboot-7214cd962fb50230d57a30b76b291fd381b85bbd.tar.gz talos-hostboot-7214cd962fb50230d57a30b76b291fd381b85bbd.zip |
Update ecmd debug scripts and fapi_utils script with Axone targets
In my first pass to get things working I missed updating these
scripts. I intentionally didn't update the mrw parsing scripts
that work will be done in another story.
Change-Id: Ieb11062911a841e83eb0a7fc7fcf6f861e12e241
RTC:172969
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/63917
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: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src')
-rwxr-xr-x | src/build/debug/Hostboot/FapiAttr.pm | 8 | ||||
-rwxr-xr-x | src/build/debug/Hostboot/HwpfAttrOverride.pm | 37 | ||||
-rw-r--r-- | src/usr/targeting/xmltohb/fapi_utils.pl | 5 |
3 files changed, 48 insertions, 2 deletions
diff --git a/src/build/debug/Hostboot/FapiAttr.pm b/src/build/debug/Hostboot/FapiAttr.pm index 924f7f8de..8598b9c20 100755 --- a/src/build/debug/Hostboot/FapiAttr.pm +++ b/src/build/debug/Hostboot/FapiAttr.pm @@ -427,7 +427,13 @@ sub cronusTargetStr() "00100000" => "p9n.ppe", "00200000" => "p9n.perv", "00400000" => "p9n.pec", - "00800000" => "p9n.phb" + "00800000" => "p9n.phb", + "01000000" => "p9n.mc", + "02000000" => "p9n.omi", + "04000000" => "p9n.omic", + "08000000" => "p9n.mcc", + "10000000" => "ocmb" + "20000000" => "ocmb.memport" ); my $cro_type = $types{$targetType_hexstr}; diff --git a/src/build/debug/Hostboot/HwpfAttrOverride.pm b/src/build/debug/Hostboot/HwpfAttrOverride.pm index 5f216f5a8..5016c9845 100755 --- a/src/build/debug/Hostboot/HwpfAttrOverride.pm +++ b/src/build/debug/Hostboot/HwpfAttrOverride.pm @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2012,2017 +# Contributors Listed Below - COPYRIGHT 2012,2018 # [+] International Business Machines Corp. # # @@ -68,6 +68,11 @@ use constant TARGET_TYPE_PERV => 0x00200000; use constant TARGET_TYPE_PEC => 0x00400000; use constant TARGET_TYPE_PHB => 0x00800000; use constant TARGET_TYPE_L4 => 0x00000200; +use constant TARGET_TYPE_MC => 0x01000000; +use constant TARGET_TYPE_MCC => 0x08000000; +use constant TARGET_TYPE_OMI => 0x02000000; +use constant TARGET_TYPE_OCMB => 0x10000000; +use constant TARGET_TYPE_MEM_PORT => 0x20000000; # From attributeTank.H use constant ATTR_POS_NA => 0xffff; @@ -679,6 +684,36 @@ sub main $targType = TARGET_TYPE_L4; $targ =~ s/^.*memb.l4//; } + elsif ($targ =~ /pu.mc/) + { + $targType = TARGET_TYPE_MC; + $targ =~ s/^.*pu.mc//; + } + elsif ($targ =~ /pc.mcc/) + { + $targType = TARGET_TYPE_MCC; + $targ =~ s/^.*pu.mcc//; + } + elsif ($targ =~ /pu.omi/) + { + $targType = TARGET_TYPE_OMI; + $targ =~ s/^.*pu.omi//; + } + elsif ($targ =~ /memb.omic/) + { + $targType = TARGET_TYPE_OMIC; + $targ =~ s/^.*memb.omic//; + } + elsif ($targ =~ /ocmb/) + { + $targType = TARGET_TYPE_OCMB; + $targ =~ s/^.*ocmb//; + } + elsif ($targ =~ /ocmb.memport/) + { + $targType = TARGET_TYPE_MEM_PORT; + $targ =~ s/^.*ocmb.memport//; + } # Figure out the position if ($targ =~ /:p(\d+)/) diff --git a/src/usr/targeting/xmltohb/fapi_utils.pl b/src/usr/targeting/xmltohb/fapi_utils.pl index 71e9bd144..85bebcd2d 100644 --- a/src/usr/targeting/xmltohb/fapi_utils.pl +++ b/src/usr/targeting/xmltohb/fapi_utils.pl @@ -271,6 +271,11 @@ sub createTargetExtensionFromFapi(\%,\%) TARGET_TYPE_PEC => "unit-pec-power9", TARGET_TYPE_PHB => "unit-phb-power9", TARGET_TYPE_MC => "unit-mc-power9", + TARGET_TYPE_OMI => "unit-omi-power9", + TARGET_TYPE_OMIC => "unit-omic-power9", + TARGET_TYPE_MCC => "unit-mcc-power9", + TARGET_TYPE_OCMB_CHIP => "chip-ocmb", + TARGET_TYPE_MEM_PORT => "unit-mem_port" }; # Loop through all of the targets that this attribute |