Skip to content

Commit 77a31e8

Browse files
cvswendcrowell77
authored andcommitted
Setup the WOFDATA binary in hbfw img makefile
Change-Id: Iacab77b18f30ce2e545253fff53037c0c14a3fd2 CMVC-Prereq: 1025390 RTC:175646 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41694 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Martin Gloff <mgloff@us.ibm.com> Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com> Tested-by: Jenkins OP Build CI <op-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>
1 parent 6a819aa commit 77a31e8

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/build/citest/etc/workarounds.postsimsetup

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,9 @@
3434
#patch -p0 $sb/simu/data/cec-chip/base_cec_chip_file $PROJECT_ROOT/src/build/citest/etc/patches/my_patch_File
3535
#pull in new actions in p9_memory.act RTC 171066
3636

37+
#wof data image
38+
echo "Applying SIMICS workaround to support WOF data generation"
39+
sbex -t 1025390
40+
mkdir -p $sb/engd/wofdata/
41+
cd $sb/engd/wofdata
42+
mk -a -k

src/build/mkrules/hbfw/img/makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ HBFW_OBJPATH = ${.PATH:M*obj*}
4646
ENGD_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/href/g}
4747
ENGD_SRCPATH = ${SRCPATH:S/hbfw\/img/engd\/href/g}
4848
SBEI_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/sbei\/sbfw\/img/g}
49+
ENGD_WOFPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/wofdata/g}
4950

5051
#################################################
5152
# Copy Hostboot binary images to obj dir to be grabbed
@@ -62,6 +63,7 @@ HBB_IMG = hostboot.bin
6263
HBB_ECC_IMG = hostboot.bin.ecc
6364
HBI_IMG = hostboot_extended.bin
6465
HBRT_IMG = hostboot_runtime.bin
66+
WOFDATA_IMG = ${ENGD_WOFPATH:Fzz_wof_data.bin}
6567
BASE_IMAGES = ${BOOTLDR_IMG} ${HB_SECROM_IMG} ${HBB_IMG} ${HBI_IMG} ${HBRT_IMG}
6668

6769
# Input fake images
@@ -121,7 +123,7 @@ PNOR_LAYOUT = ${pnorLayoutFSP.xml:P}
121123
# Decide which PNOR to build
122124
.if(${FAKEPNOR} == "")
123125
# Parameters passed into GEN_PNOR_IMAGE_SCRIPT.
124-
GEN_DEFAULT_BIN_FILES = HBBL=${HBBL_IMG},HBB=${HBB_IMG},HBI=${HBI_IMG},HBRT=${HBRT_IMG},TEST=EMPTY,TESTRO=EMPTY,HBEL=EMPTY,GUARD=EMPTY,GLOBAL=EMPTY,PAYLOAD=EMPTY,CVPD=EMPTY,MVPD=EMPTY,DJVPD=EMPTY,RINGOVD=EMPTY,SBKT=EMPTY,WOFDATA=EMPTY,FIRDATA=EMPTY
126+
GEN_DEFAULT_BIN_FILES = HBBL=${HBBL_IMG},HBB=${HBB_IMG},HBI=${HBI_IMG},HBRT=${HBRT_IMG},TEST=EMPTY,TESTRO=EMPTY,HBEL=EMPTY,GUARD=EMPTY,GLOBAL=EMPTY,PAYLOAD=EMPTY,CVPD=EMPTY,MVPD=EMPTY,DJVPD=EMPTY,RINGOVD=EMPTY,SBKT=EMPTY,WOFDATA=${WOFDATA_IMG},FIRDATA=EMPTY
125127
DEFAULT_PARAMS = --build-all --emit-eccless ${TARGET_TEST:b--test} ${HB_STANDALONE:b--hb-standalone} \
126128
${CONFIG_SECUREBOOT:b--secureboot} --systemBinFiles ${GEN_DEFAULT_BIN_FILES} \
127129
--pnorLayout ${PNOR_LAYOUT} ${KEY_TRANSITION_PARAMS} ${CORRUPT_PARAMS} \

0 commit comments

Comments
 (0)