diff options
| author | Christian Geddes <crgeddes@us.ibm.com> | 2019-07-11 11:14:02 -0500 |
|---|---|---|
| committer | Daniel M Crowell <dcrowell@us.ibm.com> | 2019-07-30 15:19:58 -0500 |
| commit | b3c0accfea52da03ec2b31fecc4271655aaa68f0 (patch) | |
| tree | 4bd746bc23bca3d42b6845b1441ca4eed12359fb /src/usr/vpd | |
| parent | be772a1e39083115ac77b70187a29c75fa1f12be (diff) | |
| download | blackbird-hostboot-b3c0accfea52da03ec2b31fecc4271655aaa68f0.tar.gz blackbird-hostboot-b3c0accfea52da03ec2b31fecc4271655aaa68f0.zip | |
Remove MVPD,MEMD and CENHWIMG section from Axone pnor layout
This commit removes the MVPD, MEMD and CENHWIMG sections from the axone
pnor layout as they are not being used and pnor space is limited.
Along with removing the defintion in the pnor layout xml some code
changes were required to no longer attempt to load the MVPD/MEMD sections.
Change-Id: I20739e30ad497737c0a30b66cc36052c08c11de2
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80295
Reviewed-by: Glenn Miles <milesg@ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@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: Daniel M Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/vpd')
| -rwxr-xr-x | src/usr/vpd/test/dvpdtest.H | 6 | ||||
| -rwxr-xr-x | src/usr/vpd/vpd.C | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/usr/vpd/test/dvpdtest.H b/src/usr/vpd/test/dvpdtest.H index b0d62a062..c5fe0bc97 100755 --- a/src/usr/vpd/test/dvpdtest.H +++ b/src/usr/vpd/test/dvpdtest.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2018 */ +/* Contributors Listed Below - COPYRIGHT 2013,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -732,7 +732,7 @@ class DVPDTest: public CxxTest::TestSuite DVPDTest() : CxxTest::TestSuite() { TRACFCOMP( g_trac_vpd, "Starting DVPDTest" ); -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) #ifndef __HOSTBOOT_RUNTIME errlHndl_t l_err = loadSecureSection(PNOR::MEMD); if(l_err) @@ -746,7 +746,7 @@ class DVPDTest: public CxxTest::TestSuite ~DVPDTest() { -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) #ifndef __HOSTBOOT_RUNTIME errlHndl_t l_err = unloadSecureSection(PNOR::MEMD); TRACFCOMP( g_trac_vpd, "Ending DVPDTest" ); diff --git a/src/usr/vpd/vpd.C b/src/usr/vpd/vpd.C index bae60f483..0ee7c9bcb 100755 --- a/src/usr/vpd/vpd.C +++ b/src/usr/vpd/vpd.C @@ -1251,14 +1251,16 @@ void getListOfOverrideSections( OverrideRsvMemMap_t& o_overrides ) delete l_elog; return; } + else + { + // Add MEMD section + OverrideSpecifier_t l_memd = { + PNOR::MEMD, + l_memd_info.size + }; - // Add MEMD section - OverrideSpecifier_t l_memd = { - PNOR::MEMD, - l_memd_info.size - }; - - o_overrides[0x4D454D44/*MEMD*/] = l_memd; + o_overrides[0x4D454D44/*MEMD*/] = l_memd; + } } }; //end VPD namespace |
