diff options
| author | Christian Geddes <crgeddes@us.ibm.com> | 2019-02-04 15:24:04 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-02-13 14:39:32 -0600 |
| commit | eee350897db3e72a40baa3d4e5c36600f092b7ab (patch) | |
| tree | 7cd891cb97c8e580532ba8f6ee1895f82747dfc5 /src/build/tools | |
| parent | c47875eb8c65cbdf29032377c9dc584d081ef35b (diff) | |
| download | talos-hostboot-eee350897db3e72a40baa3d4e5c36600f092b7ab.tar.gz talos-hostboot-eee350897db3e72a40baa3d4e5c36600f092b7ab.zip | |
Fix issues w/ axone updates to simics scripts
Simics teams were hitting a problem trying to boot older simics models
because our scripts relied on $MACHINE being set to CEC_MODEL. This
value gets set by linux so we cannot rely on it. Instead use the old
way to lookup MODEL for older version of simics, and for new way,
(axone and beyond) just force MODEL to be "AXONE" for now. Eventually
simics team needs to provide interface to lookup MODEL. Also in this
commit we need to write "0x5A5A5A5A" to the SBE seeprom images to avoid
updates, update the simics backing build, and change the CLI args for
hb startsimics in axone to no longer use -o and always pass in the path
to the combined SBE image/ HBBL image
Change-Id: Ib477e86b0b8aa1a4d44545c62b16fc2cbed2034b
CQ: SW453806
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71323
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: CALEB SCHLOSSIN <calebs@us.ibm.com>
Reviewed-by: VIJAY F. LOBO <vflobo@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build/tools')
| -rwxr-xr-x | src/build/tools/hb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/build/tools/hb b/src/build/tools/hb index 29c2d43cc..d12a40656 100755 --- a/src/build/tools/hb +++ b/src/build/tools/hb @@ -424,8 +424,8 @@ hb_startsimics() #export MYDIR=$bb/obj/ppc/hbfw/simics/startup.simics #then /runsim -m axone -o hb_script_to_run=$MYDIR export MY_DIR="${SANDBOXBASE}/obj/ppc/simu/scripts/hbfw" - echo "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor" - execute_in_sandbox "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor" "ppc" + echo "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1" + execute_in_sandbox "cd ${SANDBOXBASE}/simics/ && ./runsim -m ${MACHINE} hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor sbe_seeprom_img=${SANDBOXBASE}/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1" "ppc" else execute_in_sandbox \ "start_simics -machine ${MACHINE} ${SIMICSOPTIONS} $*" "ppc" |
