summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Cprek <smcprek@us.ibm.com>2015-07-31 16:53:54 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2015-08-10 14:18:27 -0500
commita6b474a1270f559ae0b7b8cf8fa994e022882f4e (patch)
tree463fd30433f217da410f45de659eac2152868a4d
parenta2903b8659ac76c82a757ffbaa5055cdae983149 (diff)
downloadtalos-hostboot-a6b474a1270f559ae0b7b8cf8fa994e022882f4e.tar.gz
talos-hostboot-a6b474a1270f559ae0b7b8cf8fa994e022882f4e.zip
Add ability to limit number of pnors built in hb prime
Change-Id: Ifd55f179c5c88e1300ec720f263a0935050b3b6e Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19479 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rwxr-xr-xsrc/build/mkrules/hbfw/img/makefile20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index 925061e63..4598b3a27 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -45,7 +45,6 @@ install_all: inject_ecc build_sbe_partitions build_pnor_images
HBFW_OBJPATH = ${.PATH:M*obj*}
ENGD_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/href/g}
-
#################################################
# Copy Hostboot binary images to obj dir to be grabbed
# during build flash pass and consumption by HWSV.
@@ -319,14 +318,17 @@ FFSCMD = ${DUMMY:!which ffs 2>/dev/null!i}
${IMAGE_TARGET}: ${IMAGE_LAYOUT} ${IMAGE_BINS} ${PNOR_BUILD_SCRIPT}
.if empty(FFSCMD)
- ${PNOR_BUILD_SCRIPT} --pnorOutBin ${IMAGE_TARGET} \
- ${TARGET_TEST:b--test} --pnorLayout ${IMAGE_LAYOUT} \
- ${IMAGE_BIN_OPTION} --fpartCmd "fpart" --fcpCmd "fcp"
+ .if(${PNOR} == ${IMAGE_TARGET} || ${PNOR} == "")
+ ${PNOR_BUILD_SCRIPT} --pnorOutBin ${IMAGE_TARGET} \
+ ${TARGET_TEST:b--test} --pnorLayout ${IMAGE_LAYOUT} \
+ ${IMAGE_BIN_OPTION} --fpartCmd "fpart" --fcpCmd "fcp"
+ .endif
.else
- ${PNOR_BUILD_SCRIPT} --pnorOutBin ${IMAGE_TARGET} \
- ${TARGET_TEST:b--test} --pnorLayout ${IMAGE_LAYOUT} \
- ${IMAGE_BIN_OPTION} --ffsCmd "ffs"
-
+ .if(${PNOR} == ${IMAGE_TARGET})
+ ${PNOR_BUILD_SCRIPT} --pnorOutBin ${IMAGE_TARGET} \
+ ${TARGET_TEST:b--test} --pnorLayout ${IMAGE_LAYOUT} \
+ ${IMAGE_BIN_OPTION} --ffsCmd "ffs"
+ .endif
.endif
.endif
@@ -348,7 +350,7 @@ update_images_for_sandbox: inject_ecc build_sbe_partitions build_pnor_images
#Copy hostboot base image to flash dir
${FLASH_IMG:@image@${baseimg:!cd ${FLASH_DEST}; cp -f ${.PATH:F${image}} ${image};!e}@}
#Copy pnor images to flash dir
- ${PNOR_IMG_INFO:@image@${pnorimg:!cd ${FLASH_DEST}; cp -f ${.PATH:F${image:s/:/ /g:xs/ .*//}} ${image:s/:/ /g:xs/ .*//};!e}@}
+ ${PNOR_IMG_INFO:@image@${pnorimg:!cd ${FLASH_DEST}; if [ "${PNOR}" == "${image:s/:/ /g:xs/ .*//}" ] || [ "${PNOR}" == "" ]; then cp -f ${.PATH:F${image:s/:/ /g:xs/ .*//}} ${image:s/:/ /g:xs/ .*//}; fi !e}@}
.endif
OpenPOWER on IntegriCloud