diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/pnor/pnor_utils.C | 4 | ||||
| -rw-r--r-- | src/usr/runtime/common/runtime_utils.C | 4 | ||||
| -rw-r--r-- | src/usr/util/utillidpnor.C | 9 |
3 files changed, 5 insertions, 12 deletions
diff --git a/src/usr/pnor/pnor_utils.C b/src/usr/pnor/pnor_utils.C index 95989cd66..68df913e0 100644 --- a/src/usr/pnor/pnor_utils.C +++ b/src/usr/pnor/pnor_utils.C @@ -378,8 +378,7 @@ bool PNOR::isEnforcedSecureSection(const uint32_t i_section) i_section == MEMD || i_section == CAPP || i_section == TESTLOAD || - i_section == VERSION || - i_section == UVBWLIST; + i_section == VERSION; #endif #else return false; @@ -451,7 +450,6 @@ const char * PNOR::SectionIdToString( uint32_t i_secIdIndex ) "CENHWIMG", /**< PNOR::CENTAUR_HW_IMG : Centaur HCODE ref image */ "HDAT", /**< PNOR::HDAT : Hdat Data */ "EECACHE", /**< PNOR::EECACHE : Cached data from various EEPROMs */ - "UVBWLIST", /**< PNOR::UVBWLIST : Ultravisor XSCOM white/blacklist */ #endif }; diff --git a/src/usr/runtime/common/runtime_utils.C b/src/usr/runtime/common/runtime_utils.C index e61d90b31..ba15de167 100644 --- a/src/usr/runtime/common/runtime_utils.C +++ b/src/usr/runtime/common/runtime_utils.C @@ -31,7 +31,6 @@ namespace RUNTIME // -- OCC // -- WOFDATA // -- HCODE -// -- UVBWLIST // -- Images that never have secure headers /// -- RINGOVD const PreVerifyVector preVerifiedPnorSections { @@ -40,9 +39,6 @@ const PreVerifyVector preVerifiedPnorSections { {PNOR::HCODE, true}, {PNOR::VERSION, true}, {PNOR::RINGOVD, false}, -#ifndef CONFIG_FSP_BUILD - {PNOR::UVBWLIST, true}, -#endif }; bool isPreVerifiedSection(const PNOR::SectionId i_section) 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)}, |
