diff options
author | Stephen Cprek <smcprek@us.ibm.com> | 2017-07-12 12:03:21 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-07-24 16:13:26 -0400 |
commit | 6e3fe0e8ca4c4ea96b219497a4ae41c3a5e51dbd (patch) | |
tree | c449505c4e5d0692180674cca1fb8161952a0466 | |
parent | c0fe969256eb9509c184b2a2cdeba39c12ceaebb (diff) | |
download | talos-hostboot-6e3fe0e8ca4c4ea96b219497a4ae41c3a5e51dbd.tar.gz talos-hostboot-6e3fe0e8ca4c4ea96b219497a4ae41c3a5e51dbd.zip |
Remove SBEC pnor partition from p9 code
Change-Id: I13e79a6542353e42ac809cc60295947dfb1acb96
RTC: 163810
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43048
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: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r-- | src/build/buildpnor/defaultPnorLayout.xml | 11 | ||||
-rwxr-xr-x | src/build/buildpnor/genPnorImages.pl | 2 | ||||
-rw-r--r-- | src/build/buildpnor/pnorLayoutFSP.xml | 11 | ||||
-rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 5 | ||||
-rw-r--r-- | src/include/usr/pnor/pnor_const.H | 1 | ||||
-rw-r--r-- | src/include/usr/sbe/sbe_update.H | 7 | ||||
-rw-r--r-- | src/usr/pnor/pnor_utils.C | 2 | ||||
-rw-r--r-- | src/usr/pore/test/poretest.H | 6 | ||||
-rw-r--r-- | src/usr/sbe/sbe_update.C | 4 |
9 files changed, 6 insertions, 43 deletions
diff --git a/src/build/buildpnor/defaultPnorLayout.xml b/src/build/buildpnor/defaultPnorLayout.xml index dd9c4ae7a..c1831b248 100644 --- a/src/build/buildpnor/defaultPnorLayout.xml +++ b/src/build/buildpnor/defaultPnorLayout.xml @@ -148,17 +148,6 @@ Layout Description <side>sideless</side> <ecc/> </section> - <!-- #@TODO RTC:163810 - Put this back later if needed - <section> - <description>Centaur SBE (576K)</description> - <eyeCatch>SBEC</eyeCatch> - <physicalOffset>0x83D000</physicalOffset> - <physicalRegionSize>0x90000</physicalRegionSize> - <sha512perEC/> - <side>sideless</side> - <ecc/> - </section> - --> <section> <description>SBE-IPL (Staging Area) (520K)</description> <eyeCatch>SBE</eyeCatch> diff --git a/src/build/buildpnor/genPnorImages.pl b/src/build/buildpnor/genPnorImages.pl index 456656395..2b7b8c708 100755 --- a/src/build/buildpnor/genPnorImages.pl +++ b/src/build/buildpnor/genPnorImages.pl @@ -539,11 +539,9 @@ sub manipulateImages # Sections that have secureboot support. Secureboot still must be # enabled for secureboot actions on these partitions to occur. - # @TODO securebootp9 re-enable with SBE/SBEC/PAYLOAD secureboot ports my $isNormalSecure = ($eyeCatch eq "HBBL"); $isNormalSecure ||= ($eyeCatch eq "SBE"); $isNormalSecure ||= ($eyeCatch eq "HBRT"); - #$isNormalSecure ||= ($eyeCatch eq "SBEC"); $isNormalSecure ||= ($eyeCatch eq "PAYLOAD"); $isNormalSecure ||= ($eyeCatch eq "OCC"); $isNormalSecure ||= ($eyeCatch eq "CAPP"); diff --git a/src/build/buildpnor/pnorLayoutFSP.xml b/src/build/buildpnor/pnorLayoutFSP.xml index 70f6ef2bc..0ce58ad67 100644 --- a/src/build/buildpnor/pnorLayoutFSP.xml +++ b/src/build/buildpnor/pnorLayoutFSP.xml @@ -148,17 +148,6 @@ Layout Description - Used when building an FSP driver <side>sideless</side> <ecc/> </section> - <!-- #@TODO RTC:163810 - Put this back later if needed - <section> - <description>Centaur SBE (576K)</description> - <eyeCatch>SBEC</eyeCatch> - <physicalOffset>0x83D000</physicalOffset> - <physicalRegionSize>0x90000</physicalRegionSize> - <sha512perEC/> - <side>sideless</side> - <ecc/> - </section> - --> <section> <description>SBE-IPL (Staging Area) (520K)</description> <eyeCatch>SBE</eyeCatch> diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index 4375a14a5..976075a10 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -237,7 +237,6 @@ NIMBUS_HBD_IMG = simics_${NIMBUS}_targeting.bin NIMBUS_HCODE_IMG = ${ENGD_SRCPATH:Fp9n.hw_ref_image.bin} NIMBUS_SBE_IMG = p9nSbePartition.bin NIMBUS_OCC_IMG = ${bb}/images/ppc/lab/fs/p9le/rootfs/opt/extucode/81e00430.lid -SBEC_IMG = centSbePartition.bin # Input fake images NIMBUS_VPO_HBD_IMG = vbu_${NIMBUS}_targeting.bin @@ -247,7 +246,6 @@ NIMBUS_HBD_FINAL_IMG = ${NIMBUS}.HBD.bin NIMBUS_HCODE_FINAL_IMG = ${NIMBUS}.HCODE.bin NIMBUS_SBE_FINAL_IMG = ${NIMBUS}.SBE.bin NIMBUS_OCC_FINAL_IMG = ${NIMBUS}.OCC.bin -SBEC_FINAL_IMG = SBEC.bin # Decide which PNOR to build .if(${FAKEPNOR} == "") @@ -257,14 +255,12 @@ SBEC_FINAL_IMG = SBEC.bin .else GEN_NIMBUS_BIN_FILES = ${NIMBUS}:SBE=${${NIMBUS_SBE_IMG}:P},HCODE=${${NIMBUS_HCODE_IMG}:P},HBD=${${NIMBUS_HBD_IMG}:P} .endif - #@TODO RTC:163810 - Put SBEC back "--systemBinFile SBEC=${${SBEC_IMG}:P}" SYSTEM_SPECIFIC_PARAMS = --install-all --emit-eccless ${TARGET_TEST:b--test} ${CONFIG_SECUREBOOT:b--secureboot} \ --pnorLayout ${PNOR_LAYOUT} ${CORRUPT_PARAMS} ${HB_STANDALONE:b--hb-standalone} \ --systemBinFiles ${GEN_NIMBUS_BIN_FILES} --hwKeyHashFile ${IMPRINT_HW_KEY_HASH} .else # Parameters passed into GEN_PNOR_IMAGE_SCRIPT. GEN_NIMBUS_BIN_FILES = ${NIMBUS}:HCODE=${${NIMBUS_HCODE_IMG}:P},HBD=${${NIMBUS_VPO_HBD_IMG}:P} - #@TODO RTC:163810 - Put SBEC back "--systemBinFile SBEC=${${SBEC_IMG}:P}" SYSTEM_SPECIFIC_PARAMS = --pnorLayout ${PNOR_LAYOUT} \ --systemBinFiles ${GEN_NIMBUS_BIN_FILES} .endif @@ -286,7 +282,6 @@ gen_system_specific_images: build_sbe_partitions .PMAKE @${MAKE:T:R} gen_system_specific_images_bypass_cache HOSTBOOT_DEFAULT_SECTIONS = HBBL=${HBBL_FINAL_IMG},HBB=${HBB_FINAL_IMG},HBI=${HBI_FINAL_IMG},HBRT=${HBRT_FINAL_IMG},TEST=${TEST_FINAL_IMG},TESTRO=${TESTRO_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},GUARD=${GUARD_FINAL_IMG},GLOBAL=${GLOBAL_FINAL_IMG},PAYLOAD=${PAYLOAD_FINAL_IMG},CVPD=${CVPD_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},RINGOVD=${RINGOVD_FINAL_IMG},SBKT=${SBKT_FINAL_IMG},WOFDATA=${WOFDATA_FINAL_IMG},FIRDATA=${FIRDATA_FINAL_IMG} -#@TODO RTC:163810 - Put SBEC back "SBEC=${SBEC_FINAL_IMG}," .if(${DEFAULT_PNOR} == 1) NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG},OCC=${NIMBUS_OCC_FINAL_IMG} .else diff --git a/src/include/usr/pnor/pnor_const.H b/src/include/usr/pnor/pnor_const.H index d776a543d..667ed5487 100644 --- a/src/include/usr/pnor/pnor_const.H +++ b/src/include/usr/pnor/pnor_const.H @@ -45,7 +45,6 @@ enum SectionId #endif HB_BASE_CODE, /**< Hostboot Base Image */ #ifndef BOOTLOADER - CENTAUR_SBE, /**< Centaur Self-Boot Engine image */ SBE_IPL, /**< Self-Boot Engine IPL image */ HCODE, /**< HCODE Reference image */ PAYLOAD, /**< HAL/OPAL */ diff --git a/src/include/usr/sbe/sbe_update.H b/src/include/usr/sbe/sbe_update.H index 02cebeedb..a831df5d8 100644 --- a/src/include/usr/sbe/sbe_update.H +++ b/src/include/usr/sbe/sbe_update.H @@ -91,7 +91,7 @@ namespace SBE const uint32_t RING_OVD_SIZE = 0x800; - // PNOR SBE and SBEC Partition constants + // PNOR SBE Partition constants const uint32_t MAX_SBE_ENTRIES = 9; const uint32_t SBETOC_EYECATCH = 0x53424500; //'SBE\0' const uint64_t NONSECURE_VER_EYECATCH = 0x56455253494F4E00; //'VERSION\0' @@ -225,7 +225,7 @@ namespace SBE /** - * @brief Struct of individual SBE entry in SBE and SBEC + * @brief Struct of individual SBE entry in SBE * Table of Contents in PNOR partitions */ struct sbeTocEntry_t @@ -236,8 +236,7 @@ namespace SBE } PACKED; /** - * @brief Layout of Table of Contents at beginning of SBE and - * SBEC Partitions in PNOR + * @brief Layout of Table of Contents at beginning of SBE Partitions in PNOR */ struct sbeToc_t { diff --git a/src/usr/pnor/pnor_utils.C b/src/usr/pnor/pnor_utils.C index 7c19a76bb..1ee89e349 100644 --- a/src/usr/pnor/pnor_utils.C +++ b/src/usr/pnor/pnor_utils.C @@ -388,7 +388,6 @@ bool PNOR::isEnforcedSecureSection(const uint32_t i_section) i_section == HB_EXT_CODE || i_section == HB_DATA || i_section == SBE_IPL || - i_section == CENTAUR_SBE || i_section == PAYLOAD || i_section == SBKT || i_section == OCC || @@ -435,7 +434,6 @@ const char * PNOR::SectionIdToString( uint32_t i_secIdIndex ) #endif "HBB", /**< PNOR::HB_BASE_CODE : Hostboot Base Image */ #ifndef BOOTLOADER - "SBEC", /**< PNOR::CENTAUR_SBE : Centaur Self-Boot Engine image */ "SBE", /**< PNOR::SBE_IPL : Self-Boot Enginer IPL image */ "HCODE", /**< PNOR::HCODE : HCODE Reference image */ "PAYLOAD", /**< PNOR::PAYLOAD : HAL/OPAL */ diff --git a/src/usr/pore/test/poretest.H b/src/usr/pore/test/poretest.H index e0200c202..424da773c 100644 --- a/src/usr/pore/test/poretest.H +++ b/src/usr/pore/test/poretest.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2014 */ +/* Contributors Listed Below - COPYRIGHT 2011,2017 */ +/* [+] International Business Machines Corp. */ +/* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ /* you may not use this file except in compliance with the License. */ @@ -39,8 +41,6 @@ #include <vfs/vfs.H> #include <errl/errlmanager.H> -#define CENTAUR_SBE_PNOR_MRR 0 // Memory Relocation Register for Centaur - using namespace TARGETING; using namespace vsbe; diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 78f66d3e8..7fe922427 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -592,10 +592,6 @@ namespace SBE { pnorSectionId = PNOR::SBE_IPL; } - else if ( i_target->getAttr<ATTR_TYPE>() == TYPE_MEMBUF ) - { - pnorSectionId = PNOR::CENTAUR_SBE; - } else { // Unsupported target type was passed in |