diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2017-07-24 10:37:59 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-07-24 16:06:19 -0400 |
| commit | cf20b92e8e08cef8e287db1c9c70cc99c1471113 (patch) | |
| tree | 06343b97e3e6411c2f953f9e66cce79969c83641 /src/build/mkrules | |
| parent | d13d9a3fe9426dee31b58423671dad318a7a82e5 (diff) | |
| download | talos-hostboot-cf20b92e8e08cef8e287db1c9c70cc99c1471113.tar.gz talos-hostboot-cf20b92e8e08cef8e287db1c9c70cc99c1471113.zip | |
Restore lost code from bad rebase in makefile
Change-Id: I01429cb6fa92b31b23e73329a3a609eb67d40aa4
CQ: SW396780
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43513
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@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/build/mkrules')
| -rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index a477aaee7..4375a14a5 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -45,6 +45,8 @@ install_all: gen_system_specific_images build_sbe_partitions build_pnor_images HBFW_OBJPATH = ${.PATH:M*obj*} ENGD_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/href/g} ENGD_SRCPATH = ${SRCPATH:S/hbfw\/img/engd\/href/g} +SBEI_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/sbei\/sbfw\/img/g} +ENGD_WOFPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/wofdata/g} ################################################# # Copy Hostboot binary images to obj dir to be grabbed @@ -61,6 +63,7 @@ HBB_IMG = hostboot.bin HBB_ECC_IMG = hostboot.bin.ecc HBI_IMG = hostboot_extended.bin HBRT_IMG = hostboot_runtime.bin +WOFDATA_IMG = ${ENGD_WOFPATH:Fzz_wof_data.bin} BASE_IMAGES = ${BOOTLDR_IMG} ${HB_SECROM_IMG} ${HBB_IMG} ${HBI_IMG} ${HBRT_IMG} # Input fake images @@ -120,7 +123,7 @@ PNOR_LAYOUT = ${pnorLayoutFSP.xml:P} # Decide which PNOR to build .if(${FAKEPNOR} == "") # Parameters passed into GEN_PNOR_IMAGE_SCRIPT. - 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 + 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 DEFAULT_PARAMS = --build-all --emit-eccless ${TARGET_TEST:b--test} ${HB_STANDALONE:b--hb-standalone} \ ${CONFIG_SECUREBOOT:b--secureboot} --systemBinFiles ${GEN_DEFAULT_BIN_FILES} \ --pnorLayout ${PNOR_LAYOUT} ${KEY_TRANSITION_PARAMS} ${CORRUPT_PARAMS} \ @@ -168,10 +171,11 @@ clobber_cp_hbfiles: ################################################# SBE_BUILD_SCRIPT = ${buildSbePart.pl:P} -P9N_EC10_BIN = ${ENGD_OBJPATH:Fp9n_10.sbe_seeprom.hdr.bin} +P9N_EC10_BIN = ${SBEI_OBJPATH:Fp9n_10.sbe_seeprom.hdr.bin} +P9N_EC20_BIN = ${SBEI_OBJPATH:Fp9n_20.sbe_seeprom.hdr.bin} SBE_PART_INFO = \ - p9nSbePartition.bin:10=${P9N_EC10_BIN} + p9nSbePartition.bin:10=${P9N_EC10_BIN},20=${P9N_EC20_BIN} __SBE_PART_BUILD/% : .SPECTARG .PMAKE |
