diff options
author | Bill Hoffa <wghoffa@us.ibm.com> | 2018-10-08 16:05:14 -0500 |
---|---|---|
committer | Nicholas E. Bofferding <bofferdn@us.ibm.com> | 2018-12-14 14:14:23 -0600 |
commit | 2ad30a4a4e4db7bc8d3b015e408848f70c3014f8 (patch) | |
tree | 92e584ea0d897f85e75943c6d336d6ea74dc8a68 /src/build/tools/hb | |
parent | bfac98200f7ec60552fb11d2bef5a76a8ed9f24f (diff) | |
download | talos-hostboot-2ad30a4a4e4db7bc8d3b015e408848f70c3014f8.tar.gz talos-hostboot-2ad30a4a4e4db7bc8d3b015e408848f70c3014f8.zip |
Axone Simics Updates -- Finds Functional Master Proc
- Updates for new Simics infrastructure
- Finds Functional Master Proc
- Finds TPM
- Boots to istep6.9 before failing target verification
(more Axone FW changes needed)
Change-Id: Ib3f44008ed12202777c2edacea42d5cb20a4a7a3
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67206
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Diffstat (limited to 'src/build/tools/hb')
-rwxr-xr-x | src/build/tools/hb | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/src/build/tools/hb b/src/build/tools/hb index 22e5ca7ed..214202278 100755 --- a/src/build/tools/hb +++ b/src/build/tools/hb @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2011,2017 +# Contributors Listed Below - COPYRIGHT 2011,2018 # [+] International Business Machines Corp. # # @@ -355,9 +355,18 @@ hb_simsetup() hb_fipssetup DRIVER=`cat ${PROJECT_ROOT}/src/build/citest/etc/bbuild` + SIMICS_LEVEL=`cat ${PROJECT_ROOT}/src/build/citest/etc/simbuild` needs_machine_variable - execute_in_sandbox "start_simics -no_start -machine ${MACHINE}" "ppc" + if [ "${MACHINE}" == "AXONE" ]; then + echo "mkdir -p ${SANDBOXBASE}/simics" + 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" + execute_in_sandbox "cd ${SANDBOXBASE}/simics/ && ./INSTALL.sh" "ppc" + else + execute_in_sandbox "start_simics -no_start -machine ${MACHINE}" "ppc" + fi echo "Running workarounds (postsimsetup)." cp ${PROJECT_ROOT}/src/build/citest/etc/workarounds.postsimsetup ${SANDBOXBASE}/src @@ -367,7 +376,6 @@ hb_simsetup() # Put a starter copy of errl to simics directory; refresh w/ "hb errlparser" cd ${SANDBOXBASE}/simics ln -sf ${DRIVER}/obj/x86.nfp/errl/nfp/tool/errl - } hb_startsimics() @@ -411,8 +419,17 @@ hb_startsimics() echo "File DNE ${PROJECT_ROOT}/obj/genfiles/config.h" exit -1 fi - execute_in_sandbox \ - "start_simics -machine ${MACHINE} ${SIMICSOPTIONS} $*" "ppc" + + if [ "${MACHINE}" == "AXONE" ]; then + #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} -o 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} -o hb_script_to_run=${MY_DIR}/startup.simics pnor_img=${MY_DIR}/../../../hbfw/img/axone.pnor" "ppc" + else + execute_in_sandbox \ + "start_simics -machine ${MACHINE} ${SIMICSOPTIONS} $*" "ppc" + fi } hb_rsync_call() |