From eeb5732a169d35955e96236f6389e95a29a22af8 Mon Sep 17 00:00:00 2001 From: Ilya Smirnov Date: Tue, 26 Feb 2019 08:39:07 -0600 Subject: Revert "SMF: Create New UVBWLIST Partition" This reverts commit 9de9d8f7c5b5c73247dc69925a594fcd07ce060c. The logic for passing the XSCOM white/blacklist to Ultravisor will change drastically. The change in logic makes the UVBWLIST partition unneeded. This commit reverts all changes associated with UVBWLIST partition. Change-Id: Ife2b983a90be766f494c12bd60f5ac8cb394aa24 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72487 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Matthew Raybuck Reviewed-by: Nicholas E. Bofferding Reviewed-by: William G. Hoffa --- src/usr/util/utillidpnor.C | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/usr/util') diff --git a/src/usr/util/utillidpnor.C b/src/usr/util/utillidpnor.C index 0f2d464ae..7e910f6eb 100644 --- a/src/usr/util/utillidpnor.C +++ b/src/usr/util/utillidpnor.C @@ -48,12 +48,11 @@ const size_t lidIdStrLength = 9; // The second Lid in the pair is the Container LID (Secure Header) static const PnorLidsMap PnorToLidsMap = { - { PNOR::TESTRO, LidAndContainerLid(TEST_LIDID, INVALID_LIDID)}, + { PNOR::TESTRO, LidAndContainerLid(TEST_LIDID, INVALID_LIDID)}, { PNOR::VERSION, LidAndContainerLid(VERSION_LIDID, INVALID_LIDID)}, - { PNOR::OCC, LidAndContainerLid(OCC_LIDID, OCC_CONTAINER_LIDID)}, - { PNOR::WOFDATA, LidAndContainerLid(WOF_LIDID, WOF_CONTAINER_LIDID)}, - { PNOR::HCODE, LidAndContainerLid(NIMBUS_HCODE_LIDID, HCODE_CONTAINER_LIDID)}, - { PNOR::UVBWLIST, LidAndContainerLid(TEST_LIDID, INVALID_LIDID)}, + { PNOR::OCC, LidAndContainerLid(OCC_LIDID, OCC_CONTAINER_LIDID)}, + { PNOR::WOFDATA, LidAndContainerLid(WOF_LIDID, WOF_CONTAINER_LIDID)}, + { PNOR::HCODE, LidAndContainerLid(NIMBUS_HCODE_LIDID, HCODE_CONTAINER_LIDID)}, /* @TODO RTC:177927 - Figure out how to handle different Lids for the same PNOR section based on chip. { PNOR::HCODE, LidAndContainerLid(CUMULUS_HCODE_LIDID, HCODE_CONTAINER_LIDID)}, -- cgit v1.2.1