Skip to content

Commit

Permalink
Create and allow for PNOR SBE Partition to have DD2.3 Images
Browse files Browse the repository at this point in the history
Include DD2.3 image in SBE pnor partition
Extend pnor layout SBE section size
Update NIMBUS Simics config to DD2.2

Change-Id: I1f36fd4d122c521d51ea15f68947fde8bd9361be
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70206
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: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
097480744 authored and dcrowell77 committed Jan 23, 2019
1 parent d276ff6 commit 720ee62
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/build/citest/etc/bbuild
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/esw/fips930/Builds/b1114a_1846.930
/esw/fips930/Builds/b0116a_1904.930
10 changes: 6 additions & 4 deletions src/build/citest/etc/workarounds.postsimsetup
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2011,2018
# Contributors Listed Below - COPYRIGHT 2011,2019
# [+] International Business Machines Corp.
#
#
Expand All @@ -33,9 +33,11 @@
#cp $BACKING_BUILD/src/simu/data/cec-chip/base_cec_chip_file $sb/simu/data/cec-chip
#patch -p0 $sb/simu/data/cec-chip/base_cec_chip_file $PROJECT_ROOT/src/build/citest/etc/patches/my_patch_File

#echo "+++ Adding reg 501081D to p9c.chip +++"
mkdir -p $sb/simu/data/cec-chip/
sbex -t 1067370 -f aix@auscmvc1.austin.ibm.com@2035 -r fips921 -d $sb/../

# Bump NIMBUS up to DD2.2
mkdir -p $sb/simu/configs/
grep -v PROC_EC $BACKING_BUILD/src/simu/configs/P9_NIMBUS.config > $sb/simu/configs/P9_NIMBUS.config
echo "SETENV PROC_EC 22" >> $sb/simu/configs/P9_NIMBUS.config


##########################################################################
3 changes: 2 additions & 1 deletion src/build/mkrules/hbfw/img/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -276,14 +276,15 @@ CUMULUS_SBE_IMG = p9c.SbePartition.bin
P9N_EC20_BIN = ${SBEI_OBJPATH:Fp9n_20.sbe_seeprom.hdr.bin}
P9N_EC21_BIN = ${SBEI_OBJPATH:Fp9n_21.sbe_seeprom.hdr.bin}
P9N_EC22_BIN = ${SBEI_OBJPATH:Fp9n_22.sbe_seeprom.hdr.bin}
P9N_EC23_BIN = ${SBEI_OBJPATH:Fp9n_23.sbe_seeprom.hdr.bin}
P9C_EC13_BIN = ${SBEI_OBJPATH:Fp9c_13.sbe_seeprom.hdr.bin}
P9C_EC11_BIN = ${SBEI_OBJPATH:Fp9c_11.sbe_seeprom.hdr.bin}
P9C_EC12_BIN = ${SBEI_OBJPATH:Fp9c_12.sbe_seeprom.hdr.bin}
# TODO RTC 197497 - Use Axone SBE image once it exists
#P9A_EC10_BIN = ${SBEI_OBJPATH:Fp9a_10.sbe_seeprom.hdr.bin}

SBE_PART_INFO = \
${NIMBUS_SBE_IMG}:20=${P9N_EC20_BIN},21=${P9N_EC21_BIN},22=${P9N_EC22_BIN} \
${NIMBUS_SBE_IMG}:21=${P9N_EC21_BIN},22=${P9N_EC22_BIN},23=${P9N_EC23_BIN} \
${CUMULUS_SBE_IMG}:13=${P9C_EC13_BIN},11=${P9C_EC11_BIN},12=${P9C_EC12_BIN}
# TODO RTC 197497 - ${AXONE_SBE_IMG}:10=${P9A_EC10_BIN}

Expand Down

0 comments on commit 720ee62

Please sign in to comment.