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>

4 files changed, 0 insertions, 29 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