diff options
| author | Brian Silver <bsilver@us.ibm.com> | 2014-05-28 16:10:05 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-06-27 14:47:45 -0500 |
| commit | 98d732a527edc1a422f0f185558a38505a68e74b (patch) | |
| tree | 39f80aab49ec8f60bb1acaf07ee1717ca4b9a7a7 /src/build/mkrules/hbfw | |
| parent | 98c223360ea9641fb1ab738b29c858869f5bf31d (diff) | |
| download | talos-hostboot-98d732a527edc1a422f0f185558a38505a68e74b.tar.gz talos-hostboot-98d732a527edc1a422f0f185558a38505a68e74b.zip | |
Add Naples support to the targeting infrastructure
Change-Id: I421e5a456a8d84a844f341e8c6fd462ad557e728
RTC: 107937
Depends-On: Ie748454257938103bdb76d7ac1b5d425bc97d348
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11330
Tested-by: Jenkins Server
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build/mkrules/hbfw')
| -rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index 17b8bec16..91868fe56 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -230,18 +230,25 @@ HOSTBOOT_DEFAULT_SECTIONS = HBB=${BASE_W_HEADER_ECC_IMAGE},HBI=${EXT_ECC_HEADER_ HBFW_OBJPATH = ${.PATH:M*obj*} ENGD_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/href/g} MURANO_TARG_IMG = simics_MURANO_targeting.bin +NAPLES_TARG_IMG = simics_NAPLES_targeting.bin VENICE_TARG_IMG = simics_VENICE_targeting.bin MURANO_TARG_IMG_ECC = simics_MURANO_targeting.bin.ecc +NAPLES_TARG_IMG_ECC = simics_NAPLES_targeting.bin.ecc VENICE_TARG_IMG_ECC = simics_VENICE_targeting.bin.ecc MURANO_SLW_IMG = ${ENGD_OBJPATH:Fs1.ref_image.hdr.bin} +NAPLES_SLW_IMG = ${ENGD_OBJPATH:Fs1.ref_image.hdr.bin} VENICE_SLW_IMG = ${ENGD_OBJPATH:Fp8.ref_image.hdr.bin} MURANO_LOCAL_SLW_IMG = s1.ref_image.hdr.bin +NAPLES_LOCAL_SLW_IMG = s1.ref_image.hdr.bin VENICE_LOCAL_SLW_IMG = p8.ref_image.hdr.bin MURANO_LOCAL_SLW_IMG_ECC = s1.ref_image.hdr.bin.ecc +NAPLES_LOCAL_SLW_IMG_ECC = s1.ref_image.hdr.bin.ecc VENICE_LOCAL_SLW_IMG_ECC = p8.ref_image.hdr.bin.ecc MURANO_SBE_IMG = s1SbePartition.bin +NAPLES_SBE_IMG = s1SbePartition.bin VENICE_SBE_IMG = p8SbePartition.bin MURANO_SBE_IMG_ECC = s1SbePartition.bin.ecc +NAPLES_SBE_IMG_ECC = s1SbePartition.bin.ecc VENICE_SBE_IMG_ECC = p8SbePartition.bin.ecc SBEC_IMG = centSbePartition.bin SBEC_IMG_ECC = centSbePartition.bin.ecc @@ -250,15 +257,20 @@ TEMP_IMG = temp.bin inject_ecc: build_sbe_partitions # cp file with full path to one with local path cp ${MURANO_SLW_IMG} ${MURANO_LOCAL_SLW_IMG} + cp ${NAPLES_SLW_IMG} ${NAPLES_LOCAL_SLW_IMG} cp ${VENICE_SLW_IMG} ${VENICE_LOCAL_SLW_IMG} # HBD partition dd if=${${MURANO_TARG_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \ ecc --inject ${TEMP_IMG} --output ${MURANO_TARG_IMG_ECC} --p8; \ + dd if=${${NAPLES_TARG_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \ + ecc --inject ${TEMP_IMG} --output ${NAPLES_TARG_IMG_ECC} --p8; \ dd if=${${VENICE_TARG_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \ ecc --inject ${TEMP_IMG} --output ${VENICE_TARG_IMG_ECC} --p8; \ # SBE partition dd if=${${MURANO_SBE_IMG}:P} of=${TEMP_IMG} ibs=256k conv=sync; \ ecc --inject ${TEMP_IMG} --output ${MURANO_SBE_IMG_ECC} --p8; \ + dd if=${${NAPLES_SBE_IMG}:P} of=${TEMP_IMG} ibs=256k conv=sync; \ + ecc --inject ${TEMP_IMG} --output ${NAPLES_SBE_IMG_ECC} --p8; \ dd if=${${VENICE_SBE_IMG}:P} of=${TEMP_IMG} ibs=256k conv=sync; \ ecc --inject ${TEMP_IMG} --output ${VENICE_SBE_IMG_ECC} --p8; \ # SBEC partition @@ -267,15 +279,19 @@ inject_ecc: build_sbe_partitions # WINK partition dd if=${${MURANO_LOCAL_SLW_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \ ecc --inject ${TEMP_IMG} --output ${MURANO_LOCAL_SLW_IMG_ECC} --p8; \ + dd if=${${NAPLES_LOCAL_SLW_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \ + ecc --inject ${TEMP_IMG} --output ${NAPLES_LOCAL_SLW_IMG_ECC} --p8; \ dd if=${${VENICE_LOCAL_SLW_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \ ecc --inject ${TEMP_IMG} --output ${VENICE_LOCAL_SLW_IMG_ECC} --p8; \ rm ${TEMP_IMG} MURANO_SECT = HBD=${MURANO_TARG_IMG_ECC},SBE=${MURANO_SBE_IMG_ECC},SBEC=${SBEC_IMG_ECC},WINK=${MURANO_LOCAL_SLW_IMG_ECC} +NAPLES_SECT = HBD=${NAPLES_TARG_IMG_ECC},SBE=${NAPLES_SBE_IMG_ECC},SBEC=${SBEC_IMG_ECC},WINK=${NAPLES_LOCAL_SLW_IMG_ECC} VENICE_SECT = HBD=${VENICE_TARG_IMG_ECC},SBE=${VENICE_SBE_IMG_ECC},SBEC=${SBEC_IMG_ECC},WINK=${VENICE_LOCAL_SLW_IMG_ECC} PNOR_IMG_INFO = \ murano.pnor:defaultPnorLayout.xml:${MURANO_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \ + naples.pnor:defaultPnorLayout.xml:${NAPLES_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \ venice.pnor:defaultPnorLayout.xml:${VENICE_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \ ${FIPS_PNOR_INFO} |
