diff options
| author | Elizabeth Liner <eliner@us.ibm.com> | 2017-07-24 14:46:26 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-10 15:39:18 -0400 |
| commit | d69bcf157f23e109f4378e5d9a3cfdbfe7dfb98a (patch) | |
| tree | 1b057e9bec3d7d79f3be2a8271d2b8fafe3945e0 /src/build/mkrules | |
| parent | 84bd222f9d541e53ec9f5876366c6f09dd260a58 (diff) | |
| download | talos-hostboot-d69bcf157f23e109f4378e5d9a3cfdbfe7dfb98a.tar.gz talos-hostboot-d69bcf157f23e109f4378e5d9a3cfdbfe7dfb98a.zip | |
MEMD FSP changes
Change-Id: Id75255d7861032e2a814fdb8194ae271ba3f7fde
RTC:175544
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43565
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
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: Stephen M. Cprek <smcprek@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 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index f3f4230c9..e3cb1bec2 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -42,11 +42,12 @@ build_all: cp_hbfiles gen_default_images install_all: gen_system_specific_images build_sbe_partitions build_pnor_images #Some useful search paths -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} +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} +ENGD_MEMDPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/memd/g} ################################################# # Copy Hostboot binary images to obj dir to be grabbed @@ -240,11 +241,13 @@ NIMBUS_OCC_IMG = ${bb}/images/ppc/lab/fs/p9le/rootfs/opt/extucode/81e00430.lid CUMULUS_OCC_IMG = ${bb}/images/ppc/lab/fs/p9le/rootfs/opt/extucode/81e00430.lid ## System Specific ZZ_WOFDATA_IMG = ${ENGD_WOFPATH:Fzz_wof_data.bin} +ZZ_MEMD_IMG = ${ENGD_MEMDPATH:Fzz_memd_data.bin} # Input fake images NIMBUS_VPO_HBD_IMG = vbu_NIMBUS_targeting.bin # Output final images +# Final eyecatch name must match PNOR xml layout ## Chip Specific NIMBUS_HBD_FINAL_IMG = NIMBUS.HBD.bin CUMULUS_HBD_FINAL_IMG = CUMULUS.HBD.bin @@ -256,6 +259,7 @@ NIMBUS_OCC_FINAL_IMG = NIMBUS.OCC.bin CUMULUS_OCC_FINAL_IMG = CUMULUS.OCC.bin ## System Specific ZZ_WOFDATA_FINAL_IMG = ZZ.WOFDATA.bin +ZZ_MEMD_FINAL_IMG = ZZ.MEMD.bin # Decide which PNOR to build @@ -268,11 +272,11 @@ ZZ_WOFDATA_FINAL_IMG = ZZ.WOFDATA.bin GEN_NIMBUS_BIN_FILES = NIMBUS:SBE=${${NIMBUS_SBE_IMG}:P},HCODE=${${NIMBUS_HCODE_IMG}:P},HBD=${${NIMBUS_HBD_IMG}:P} GEN_CUMULUS_BIN_FILES = CUMULUS:SBE=${${CUMULUS_SBE_IMG}:P},HCODE=${${CUMULUS_HCODE_IMG}:P},HBD=${${CUMULUS_HBD_IMG}:P} .endif - GEN_ZZ_BIN_FILES = ZZ:WOFDATA=${${ZZ_WOFDATA_IMG}:P} + GEN_ZZ_BIN_FILES = ZZ:WOFDATA=${${ZZ_WOFDATA_IMG}:P},MEMD=${${ZZ_MEMD_IMG}:P} #@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} \ + --systemBinFiles ${GEN_NIMBUS_BIN_FILES} \ --systemBinFiles ${GEN_CUMULUS_BIN_FILES} \ --systemBinFiles ${GEN_ZZ_BIN_FILES} \ --hwKeyHashFile ${IMPRINT_HW_KEY_HASH} |
