diff options
Diffstat (limited to 'src/build')
| -rwxr-xr-x | src/build/citest/cxxtest-start.sh | 2 | ||||
| -rw-r--r-- | src/build/citest/etc/simbuild | 2 | ||||
| -rwxr-xr-x | src/build/tools/hb | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/build/citest/cxxtest-start.sh b/src/build/citest/cxxtest-start.sh index 770f5f365..97c9977a4 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 enable_lpc_console=TRUE proc_scandef_abr=${BACKING_BUILD}/obj/ppc/simu/data/cec-chip/scandef.abr" + 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 enable_lpc_console=TRUE" fi # Front end to autocitest - script to execute unit tests under simics. diff --git a/src/build/citest/etc/simbuild b/src/build/citest/etc/simbuild index b35a320a4..7918748de 100644 --- a/src/build/citest/etc/simbuild +++ b/src/build/citest/etc/simbuild @@ -1 +1 @@ -/gsa/ausgsa/projects/h/hostboot/simbuild/06_12_19_492d4f_simics.tar.gz +/gsa/ausgsa/projects/h/hostboot/simbuild/06_21_19_37d4cf_simics.tar.gz diff --git a/src/build/tools/hb b/src/build/tools/hb index 0ac8712c2..44e0d2183 100755 --- a/src/build/tools/hb +++ b/src/build/tools/hb @@ -356,6 +356,7 @@ hb_simsetup() DRIVER=`cat ${PROJECT_ROOT}/src/build/citest/etc/bbuild` SIMICS_LEVEL=`cat ${PROJECT_ROOT}/src/build/citest/etc/simbuild` + EECACHE_PREBUILT=`cat ${PROJECT_ROOT}/src/build/citest/etc/eecache_prebuilt` needs_machine_variable if [ "${MACHINE}" == "AXONE" ]; then @@ -363,7 +364,10 @@ hb_simsetup() execute_in_sandbox "mkdir -p ${SANDBOXBASE}/simics" "ppc" echo "tar ${SIMICS_LEVEL} -C ${SANDBOXBASE}/simics/" execute_in_sandbox "tar -xf ${SIMICS_LEVEL} -C ${SANDBOXBASE}/simics/" "ppc" + echo "cd ${SANDBOXBASE}/simics/ && ./INSTALL.sh" execute_in_sandbox "cd ${SANDBOXBASE}/simics/ && ./INSTALL.sh" "ppc" + echo "cp ${EECACHE_PREBUILT} ${SANDBOXBASE}/simics/eecache_prebuilt.bin.ecc" + execute_in_sandbox "cp ${EECACHE_PREBUILT} ${SANDBOXBASE}/simics/eecache_prebuilt.bin.ecc" "ppc" else execute_in_sandbox "start_simics -no_start -machine ${MACHINE}" "ppc" fi @@ -424,7 +428,7 @@ 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" - export RUNSIMCMD="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 vpd_proc=vpd/images/53e4ec8a5d8439c961a18442bef70102 enable_lpc_console=TRUE proc_scandef_abr=${DRIVER}/obj/ppc/simu/data/cec-chip/scandef.abr" + export RUNSIMCMD="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 enable_lpc_console=TRUE" echo "********** echo $RUNSIMCMD echo "********** |
