diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2017-08-13 21:03:58 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-29 10:30:25 -0400 |
| commit | bcb755c898aab3a0aa97df53f97ba1989fb223f0 (patch) | |
| tree | b2af3121afb279bd0b4cc6ae740774ebbaf12f34 /src/build | |
| parent | f54485747a6669f7bd33c021f46c9d8a28145b9e (diff) | |
| download | talos-hostboot-bcb755c898aab3a0aa97df53f97ba1989fb223f0.tar.gz talos-hostboot-bcb755c898aab3a0aa97df53f97ba1989fb223f0.zip | |
cumulus: changes to boot simics all the way to test cases
Change-Id: Ibc62f59635db28e50197139276b9b4c6b59ccc3e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44768
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build')
| -rwxr-xr-x | src/build/citest/etc/workarounds.postsimsetup | 1 | ||||
| -rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index 76b8c0aed..06657ffee 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -40,6 +40,7 @@ mk -a && mk install_all cd - #changes needed for Cumulus +#@TODO RTC:178949 echo "Applying SIMICS workaround to support Cumulus" sbex -t 1031560 cd $sb/simu diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index 18254d373..0b2ee8e51 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -245,6 +245,7 @@ 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} +ZEPPELIN_WOFDATA_IMG = ${ENGD_WOFPATH:Fzeppelin_wof_data.bin} ZZ_MEMD_IMG = ${ENGD_MEMDPATH:Fzz_memd_data.bin} # Input fake images @@ -263,6 +264,7 @@ NIMBUS_OCC_FINAL_IMG = NIMBUS.OCC.bin CUMULUS_OCC_FINAL_IMG = CUMULUS.OCC.bin ## System Specific ZZ_WOFDATA_FINAL_IMG = ZZ.WOFDATA.bin +ZEPPELIN_WOFDATA_FINAL_IMG = ZEPPELIN.WOFDATA.bin ZZ_MEMD_FINAL_IMG = ZZ.MEMD.bin @@ -278,12 +280,15 @@ ZZ_MEMD_FINAL_IMG = ZZ.MEMD.bin 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},MEMD=${${ZZ_MEMD_IMG}:P} + GEN_ZEPPELIN_BIN_FILES = ZEPPELIN:WOFDATA=${${ZEPPELIN_WOFDATA_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_CUMULUS_BIN_FILES} \ --systemBinFiles ${GEN_ZZ_BIN_FILES} \ + --systemBinFiles ${GEN_ZEPPELIN_BIN_FILES} \ --hwKeyHashFile ${IMPRINT_HW_KEY_HASH} .else # Parameters passed into GEN_PNOR_IMAGE_SCRIPT. @@ -316,11 +321,11 @@ gen_system_specific_images: build_sbe_partitions .PMAKE HOSTBOOT_DEFAULT_SECTIONS = HBBL=${HBBL_FINAL_IMG},HBB=${HBB_FINAL_IMG},HBI=${HBI_FINAL_IMG},HBRT=${HBRT_FINAL_IMG},TEST=${TEST_FINAL_IMG},TESTRO=${TESTRO_FINAL_IMG},HBEL=${HBEL_FINAL_IMG},GUARD=${GUARD_FINAL_IMG},GLOBAL=${GLOBAL_FINAL_IMG},PAYLOAD=${PAYLOAD_FINAL_IMG},CVPD=${CVPD_FINAL_IMG},MVPD=${MVPD_FINAL_IMG},DJVPD=${DJVPD_FINAL_IMG},RINGOVD=${RINGOVD_FINAL_IMG},SBKT=${SBKT_FINAL_IMG},FIRDATA=${FIRDATA_FINAL_IMG},MEMD=${MEMD_FINAL_IMG} .if(${DEFAULT_PNOR} == 1) NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG},OCC=${NIMBUS_OCC_FINAL_IMG},WOFDATA=${ZZ_WOFDATA_FINAL_IMG} - CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},OCC=${CUMULUS_OCC_FINAL_IMG} + CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},OCC=${CUMULUS_OCC_FINAL_IMG},WOFDATA=${ZEPPELIN_WOFDATA_FINAL_IMG} .else # @TODO RTC:178164 add OCC support back in NIMBUS_SECT = HBD=${NIMBUS_HBD_FINAL_IMG},SBE=${NIMBUS_SBE_FINAL_IMG},HCODE=${NIMBUS_HCODE_FINAL_IMG},WOFDATA=${ZZ_WOFDATA_FINAL_IMG} - CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG} + CUMULUS_SECT = HBD=${CUMULUS_HBD_FINAL_IMG},SBE=${CUMULUS_SBE_FINAL_IMG},HCODE=${CUMULUS_HCODE_FINAL_IMG},WOFDATA=${ZEPPELIN_WOFDATA_FINAL_IMG} .endif PNOR_IMG_INFO = \ nimbus.pnor:${PNOR_LAYOUT}:${NIMBUS_SECT},${HOSTBOOT_DEFAULT_SECTIONS} \ |
