diff options
author | Dean Sanner <dsanner@us.ibm.com> | 2016-03-25 12:55:12 -0500 |
---|---|---|
committer | William G. Hoffa <wghoffa@us.ibm.com> | 2016-05-26 14:49:35 -0400 |
commit | 56861e45a287bc60d1ec0545cbced3731e66b865 (patch) | |
tree | 2510a14d6a1da214d6c45b9d2977a3d5abd5ca97 /src/build/mkrules | |
parent | 834bccc4c031d20d7c4b56f9d10b1cb91cc617db (diff) | |
download | talos-hostboot-56861e45a287bc60d1ec0545cbced3731e66b865.tar.gz talos-hostboot-56861e45a287bc60d1ec0545cbced3731e66b865.zip |
Switch fakepnor over to VBU XML file, default to istep
Change-Id: I5fef5732c2f658438733eb8278854a08f093b85f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22494
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/build/mkrules')
-rw-r--r-- | src/build/mkrules/dist.targets.mk | 7 | ||||
-rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 13 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk index 8bf53fc70..385ff79e2 100644 --- a/src/build/mkrules/dist.targets.mk +++ b/src/build/mkrules/dist.targets.mk @@ -40,7 +40,7 @@ ROOTPATH = ../../.. # # Content targets. -VALID_TARGETS = fsp tools openpower +VALID_TARGETS = fsp tools openpower vpo # # Files which are to be directly copied into content targets. @@ -104,7 +104,6 @@ COPY_RENAME_FILES = \ img/hostboot.bin:img/hbicore$(UNDERSCORE_TEST).bin:fsp,openpower \ img/hostboot_extended.bin:img/hbicore$(UNDERSCORE_TEST)_extended.bin:fsp,openpower \ img/hostboot_runtime.bin:img/hbirt$(UNDERSCORE_TEST).bin:fsp,openpower \ - vbu_NIMBUS.pnor:img/vbu$(UNDERSCORE_TEST)_NIMBUS.pnor:vpo \ hbicore.syms:img/hbicore$(UNDERSCORE_TEST).syms:tools,vpo,openpower \ hbicore.list.bz2:img/hbicore$(UNDERSCORE_TEST).list.bz2:tools,vpo,openpower \ hbicore.bin.modinfo:img/hbicore$(UNDERSCORE_TEST).bin.modinfo:tools,vpo,openpower \ @@ -168,6 +167,8 @@ simics.tar_CONTENTS = \ src/build/simics/startup.simics \ src/build/simics/standalone.simics \ src/build/simics/combined.simics \ + src/build/simics/run_as_vpo.simics \ + src/build/simics/fake_mem.simics \ src/build/simics/ipmi_bt_responder.py \ src/build/simics/hb-simdebug.py \ src/build/debug/hb-dump-debug \ @@ -212,6 +213,8 @@ fsp.tar_CONTENTS = \ src/build/buildpnor/buildpnor.pl \ src/build/buildpnor/defaultPnorLayout.xml \ $(if $(FAKEPNOR), src/build/buildpnor/pnorLayoutFake.xml, ) \ + $(if $(FAKEPNOR), img/vbu_NIMBUS_targeting.bin, ) \ + $(if $(FAKEPNOR), img/vpo_sysmvpd.dat, ) \ img/simics_NIMBUS_targeting.bin \ obj/genfiles/fapiattrs.xml \ obj/genfiles/hb_plat_attr_srvc.H \ diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index 8bd7b4900..7773c1254 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -89,6 +89,8 @@ SECUREBOOT_SIGNED_CONTAINER = secureboot_signed_container # DEV_KEY_DIR set by env variable SIGN_PREFIX_PARAMS=-flag 0x80000000 -hka ${DEV_KEY_DIR}/hw_key_a -hkb ${DEV_KEY_DIR}/hw_key_b -hkc ${DEV_KEY_DIR}/hw_key_c -skp ${DEV_KEY_DIR}/sw_key_a SIGN_BUILD_PARAMS=-skp ${DEV_KEY_DIR}/sw_key_a +VPO_FAKE_MVPD = vpo_sysmvpd.dat + ALL_HB_IMAGES = ${BASE_IMAGES} \ ${BASE_W_HEADER_IMAGE} \ ${BASE_ECC_IMAGE} ${EXT_ECC_IMAGE} \ @@ -173,13 +175,13 @@ cp_hbfiles: .SPECTARG dd if=/dev/zero bs=256K count=1 | tr "\000" "\377" > ${TEMP_IMAGE} ecc --inject ${TEMP_IMAGE} --output ${DJVPD_ECC_IMAGE} --p8 .if(${FAKEPNOR} != "") - dd if=/dev/zero bs=128K count=1 | tr "\000" "\377" > ${DJVPD_IMAGE} + dd if=/dev/zero bs=32K count=1 | tr "\000" "\377" > ${DJVPD_IMAGE} .endif # MVPD partition dd if=/dev/zero bs=512K count=1 | tr "\000" "\377" > ${TEMP_IMAGE} ecc --inject ${TEMP_IMAGE} --output ${MVPD_ECC_IMAGE} --p8 .if(${FAKEPNOR} != "") - dd if=/dev/zero bs=256K count=1 | tr "\000" "\377" > ${MVPD_IMAGE} + dd if=${${VPO_FAKE_MVPD}:P} bs=128K count=1 > ${MVPD_IMAGE} .endif # CVPD partition dd if=/dev/zero bs=256K count=1 | tr "\000" "\377" > ${TEMP_IMAGE} @@ -268,8 +270,9 @@ HOSTBOOT_FAKEPNOR_SECTIONS = HBI=${EXT_FAKE_IMAGE},HBEL=${HBEL_IMAGE},MVPD=${MVP HBFW_OBJPATH = ${.PATH:M*obj*} ENGD_OBJPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/href/g} NIMBUS_TARG_IMG = simics_NIMBUS_targeting.bin +NIMBUS_VPO_TARG_IMG = vbu_NIMBUS_targeting.bin NIMBUS_TARG_IMG_ECC = simics_NIMBUS_targeting.bin.ecc -NIMBUS_TARG_IMG_FAKE = simics_NIMBUS_targeting.bin.fake +NIMBUS_TARG_IMG_FAKE = vbu_NIMBUS_targeting.bin.fake NIMBUS_SLW_IMG = ${ENGD_OBJPATH:Fp9n.hw_ref_image.hdr.bin} NIMBUS_LOCAL_SLW_IMG = p9n.hw_ref_image.hdr.bin NIMBUS_LOCAL_SLW_IMG_ECC = p9n.hw_ref_image.hdr.bin.ecc @@ -286,7 +289,7 @@ inject_ecc: build_sbe_partitions dd if=${${NIMBUS_TARG_IMG}:P} of=${TEMP_IMG} ibs=1024k conv=sync; \ ecc --inject ${TEMP_IMG} --output ${NIMBUS_TARG_IMG_ECC} --p8; \ #for NIMBUS fake pnor skip version header - dd if=${${NIMBUS_TARG_IMG}:P} of=${NIMBUS_TARG_IMG_FAKE} ibs=4k count=32 skip=1 conv=sync; \ + dd if=${${NIMBUS_VPO_TARG_IMG}:P} of=${NIMBUS_TARG_IMG_FAKE} ibs=4k count=32 skip=1 conv=sync; \ # SBE partition dd if=${${NIMBUS_SBE_IMG}:P} of=${TEMP_IMG} ibs=256k conv=sync; \ ecc --inject ${TEMP_IMG} --output ${NIMBUS_SBE_IMG_ECC} --p8; \ @@ -299,7 +302,7 @@ inject_ecc: build_sbe_partitions rm ${TEMP_IMG} NIMBUS_SECT = HBD=${NIMBUS_TARG_IMG_ECC},SBE=${NIMBUS_SBE_IMG_ECC},SBEC=${SBEC_IMG_ECC},WINK=${NIMBUS_LOCAL_SLW_IMG_ECC} -FAKE_SECT = HBD=${NIMBUS_TARG_IMG_FAKE} +FAKE_SECT = HBD=${NIMBUS_TARG_IMG_FAKE},WINK=${NIMBUS_LOCAL_SLW_IMG} # To build fake PNOR, set FAKEPNOR to filename of file to build, # ie, 'export FAKEPNOR=fake8m.pnor' |