diff options
author | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-07-29 03:21:16 -0500 |
---|---|---|
committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-07-29 06:54:23 -0400 |
commit | bc8b0c5daeb285c95749ddb31203a8ed2994a7d3 (patch) | |
tree | 22130e62e913c87c492f17bbf750e52a729d5f3b | |
parent | 203b368d9a331b3c3eb1b4d677da8844ce926e71 (diff) | |
download | talos-sbe-bc8b0c5daeb285c95749ddb31203a8ed2994a7d3.tar.gz talos-sbe-bc8b0c5daeb285c95749ddb31203a8ed2994a7d3.zip |
Update backing build
Change-Id: I49672b35cdc8ecd2dbfa0bd990bbc96243151d9b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27612
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
-rwxr-xr-x | customrc | 2 | ||||
-rwxr-xr-x | sbe/build/citest/create-sandbox | 29 | ||||
-rwxr-xr-x | sbe/build/citest/etc/workarounds.postsimsetup | 15 | ||||
-rwxr-xr-x | sbe/build/citest/etc/workarounds.presimsetup | 4 |
4 files changed, 25 insertions, 25 deletions
@@ -33,6 +33,6 @@ export SANDBOXNAME=test_sb #export WORKSPACE=<set it to your root ppe directory. This is required if you # to use build script locally> export MACHINE=NIMBUS -export BACKING_BUILD=/esw/fips910/Builds/b0713a_1630.910/ +export BACKING_BUILD=/esw/fips910/Builds/b0726a_1632.910/ export SIMICSOPTIONS="-nre" diff --git a/sbe/build/citest/create-sandbox b/sbe/build/citest/create-sandbox index e2b2f1f9..b2cbc0bf 100755 --- a/sbe/build/citest/create-sandbox +++ b/sbe/build/citest/create-sandbox @@ -1,4 +1,28 @@ #!/bin/sh +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: sbe/build/citest/create-sandbox $ +# +# OpenPOWER sbe Project +# +# Contributors Listed Below - COPYRIGHT 2015,2016 +# [+] International Business Machines Corp. +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# IBM_PROLOG_END_TAG echo "Creating ODE sandbox..." @@ -41,11 +65,6 @@ echo "----Setting up simics." execute_in_sandbox "start_simics -no_start -machine $MACHINE -batch_mode" \ "ppc" || exit -1 -# Copy action files. As we are taking actions files from ppe, copy them here -# so that any workaround necessary can be applied over them in pre-simsetup path -mkdir -p $SANDBOXBASE/src/simu/data/cec-chip -cp $SBEROOT/import/chips/p9/sw_simulation/* $SANDBOXBASE/src/simu/data/cec-chip || exit -1 - # Run postsimsetup workarounds. echo "----Running postsimsetup workarounds." if [ -f ${CITESTPATH}/etc/workarounds.postsimsetup ]; diff --git a/sbe/build/citest/etc/workarounds.postsimsetup b/sbe/build/citest/etc/workarounds.postsimsetup index 9cbcfd3f..8fb68617 100755 --- a/sbe/build/citest/etc/workarounds.postsimsetup +++ b/sbe/build/citest/etc/workarounds.postsimsetup @@ -33,14 +33,6 @@ #cp $BACKING_BUILD/src/simu/data/cec-chip/base_cec_chip_file $sb/simu/data/cec-chip #patch -p0 $sb/simu/data/cec-chip/base_cec_chip_file $SBEROOT/src/build/citest/etc/patches/my_patch_File -echo " +++ Add FSIMBOX KW for actions on 50018 register" -echo " patch -p0 $SANDBOXBASE/src/simu/data/cec-chip/pervasive.act $SBEROOT/sbe/build/citest/etc/patches/pervasive.act.patch" -patch -p0 $SANDBOXBASE/src/simu/data/cec-chip/pervasive.act $SBEROOT/sbe/build/citest/etc/patches/pervasive.act.patch - -echo " +++ Patching powermgmt.act file" -echo " patch -p0 $SANDBOXBASE/src/simu/data/cec-chip/powermgmt.act $SBEROOT/sbe/build/citest/etc/patches/powermgmt.act.patch" -patch -p0 $SANDBOXBASE/src/simu/data/cec-chip/powermgmt.act $SBEROOT/sbe/build/citest/etc/patches/powermgmt.act.patch - # NOTE: The below patch removes mailbox settings in standalone.simics (comes # from HB) that cause the SBE to run in plck mode. For our CI, we need the SBE # to be in istep mode. This patch is likely never going to be removed as long as @@ -50,14 +42,7 @@ mkdir -p $SANDBOXBASE/obj/ppc/simu/scripts/hbfw cp $BACKING_BUILD/obj/ppc/simu/scripts/hbfw/standalone.simics $SANDBOXBASE/obj/ppc/simu/scripts/hbfw patch -p0 $SANDBOXBASE/obj/ppc/simu/scripts/hbfw/standalone.simics $SBEROOT/sbe/build/citest/etc/patches/standalone.simics.patch -echo " +++ Add executeInstruction module call" -echo " patch -p0 $SANDBOXBASE/src/simu/data/cec-chip/chip.act $SBEROOT/sbe/build/citest/etc/patches/chip.act.patch" -patch -p0 $SANDBOXBASE/src/simu/data/cec-chip/chip.act $SBEROOT/sbe/build/citest/etc/patches/chip.act.patch - echo " +++ Add scandef patch" mkdir -p $SANDBOXBASE/src/simu/data/cec-chip/ cp -f /esw/user/nfs/prasrang/sachin/scandef.abr $SANDBOXBASE/src/simu/data/cec-chip/ -echo " +++ Add simics patch for timeout" -mkdir -p $SANDBOXBASE/simics/linux64/lib/ -cp -f /esw/user/nfs/prasrang/sachin/cec-chip.so $SANDBOXBASE/simics/linux64/lib/ diff --git a/sbe/build/citest/etc/workarounds.presimsetup b/sbe/build/citest/etc/workarounds.presimsetup index 4821f532..c3371479 100755 --- a/sbe/build/citest/etc/workarounds.presimsetup +++ b/sbe/build/citest/etc/workarounds.presimsetup @@ -30,7 +30,3 @@ #egrep -v "WSALIAS DEFAULT FIPSLEVEL|WSALIAS DEFAULT SIMICSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT FIPSLEVEL env/gfwb/simics-4.2.0/simics-4.2.83/fips/fld36/fi120201a700.42" >> $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.83/bin" >> $sb/simu/data/simicsInfo -echo "+++ Applying HW image patch from CMVC" -mkdir -p $SANDBOXBASE/src/engd/href -cp /esw/user/nfs/prasrang/sachin/p9n.temp_hw_ref_image.bin $SANDBOXBASE/src/engd/href/ - |