diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2015-09-23 12:49:36 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-09-29 13:35:16 -0500 |
| commit | ab89379aa0c4e7ceeae91f6c729cd7d120379dd5 (patch) | |
| tree | ca4efeb539023a621aab7f93d031369e9ffc8cd2 /src/build/mkrules/hbfw | |
| parent | 4fab389f133585edd833edd0aeb31f6957432f47 (diff) | |
| download | talos-hostboot-ab89379aa0c4e7ceeae91f6c729cd7d120379dd5.tar.gz talos-hostboot-ab89379aa0c4e7ceeae91f6c729cd7d120379dd5.zip | |
Allow dynamic sizing of HBI when test cases are run
Change-Id: I30947cb19125e616c57af89434acd8a9811b1a74
RTC:135217
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20735
Tested-by: Jenkins Server
Tested-by: Jenkins OP Build CI
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Jenkins OP HW
Tested-by: FSP CI Jenkins
Reviewed-by: Christopher J. Engel <cjengel@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 | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index 4598b3a27..6c4370b47 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -122,7 +122,14 @@ cp_hbfiles: .SPECTARG dd if=${EXT_SHA_IMAGE} of=${TEMP_IMAGE} ibs=4k conv=sync cat ${EXT_IMAGE} >> ${TEMP_IMAGE} # HBI partition size w/o ECC = 5MB (5120K) - dd if=${TEMP_IMAGE} of=${EXT_HEADER_IMAGE} ibs=5120k conv=sync + # If "--test" flag set do not pad to ibs=5120k, as the test HBI images is + # possibly larger than parition size and does not need to be fully padded. + # Size adjustments made in buildpnor.pl + .if($TARGET_TEST) + dd if=${TEMP_IMAGE} of=${EXT_HEADER_IMAGE} ibs=4k conv=sync + .else + dd if=${TEMP_IMAGE} of=${EXT_HEADER_IMAGE} ibs=5120k conv=sync + .endif ecc --inject ${EXT_HEADER_IMAGE} --output ${EXT_ECC_HEADER_IMAGE} --p8 # create data for a test partition in pnor dd if=/dev/urandom of=${TESTDATA} count=1 bs=32K @@ -314,23 +321,13 @@ BUILD_SPECIFIC_IMAGE: .SPECTARG ${IMAGE_TARGET} #@echo BINARIES ${IMAGE_BINS} #@echo BIN_OPTION ${IMAGE_BIN_OPTION} -FFSCMD = ${DUMMY:!which ffs 2>/dev/null!i} ${IMAGE_TARGET}: ${IMAGE_LAYOUT} ${IMAGE_BINS} ${PNOR_BUILD_SCRIPT} - .if empty(FFSCMD) - .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 - .if(${PNOR} == ${IMAGE_TARGET}) - ${PNOR_BUILD_SCRIPT} --pnorOutBin ${IMAGE_TARGET} \ - ${TARGET_TEST:b--test} --pnorLayout ${IMAGE_LAYOUT} \ - ${IMAGE_BIN_OPTION} --ffsCmd "ffs" - .endif + .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 - .endif build_pnor_images:.SPECTARG ${PNOR_IMG_INFO:S/^/__IMAGE_BUILD\//g} |
