From aa4a14d415c7418ec6e234e5b2dacf0f31040022 Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Mon, 10 Jun 2019 17:34:26 -0500 Subject: Update bbuild and point axone simics at scandef.abr from bbuild We had issues updating the backing build because the SBE code was failing to boot without getting updated scandef information. Simics was lagging behind updating their copy of the scandef so we will just point directly to the one in the bbuild we want to use in the cmd line call. Change-Id: I258ccaecc3e17e82de31ff2d6d4359dcb92045b0 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/78701 Reviewed-by: Roland Veloz Tested-by: Jenkins Server Reviewed-by: Matt Derksen Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/build/citest/cxxtest-start.sh | 2 +- src/build/citest/etc/bbuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/build/citest') diff --git a/src/build/citest/cxxtest-start.sh b/src/build/citest/cxxtest-start.sh index ede7845d4..770f5f365 100755 --- a/src/build/citest/cxxtest-start.sh +++ b/src/build/citest/cxxtest-start.sh @@ -38,7 +38,7 @@ if [ "$MACHINE" != "NIMBUS" ] && [ "$MACHINE" != "CUMULUS" ] && \ [ "$MACHINE" != "CUMULUS_CDIMM" ] && [ "$MACHINE" != "FSPBUILD" ]; then export PATH=$PATH:$SANDBOXBASE/simics/ - export START_SIMICS_CMD="runsim -m $MACHINE hb_script_to_run=$SANDBOXBASE/obj/ppc/simu/scripts/hbfw/startup.simics pnor_img=$SANDBOXBASE/obj/ppc/hbfw/img/axone.pnor sbe_seeprom_img=$SANDBOXBASE/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/53e4ec8a5d8439c961a18442bef70102" + export START_SIMICS_CMD="runsim -m $MACHINE hb_script_to_run=$SANDBOXBASE/obj/ppc/simu/scripts/hbfw/startup.simics pnor_img=$SANDBOXBASE/obj/ppc/hbfw/img/axone.pnor sbe_seeprom_img=$SANDBOXBASE/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/53e4ec8a5d8439c961a18442bef70102 enable_lpc_console=TRUE proc_scandef_abr=${BACKING_BUILD}/obj/ppc/simu/data/cec-chip/scandef.abr" fi # Front end to autocitest - script to execute unit tests under simics. diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index 873e0f4bd..a6ac16e07 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1 +1 @@ -/esw/fips930/Builds/b0121a_1904.930 +/esw/fips940/Builds/b0516a_1921.940 -- cgit v1.2.1