Skip to content

Commit

Permalink
Update bbuild to b0129a and remove patches
Browse files Browse the repository at this point in the history
Change-Id: Ia67c9211c7605466ce66bb97f27467ef40501a75
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35828
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
cvswen authored and dcrowell77 committed Feb 3, 2017
1 parent 1a26cf4 commit 135b23e
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 68 deletions.
2 changes: 1 addition & 1 deletion src/build/citest/etc/bbuild
@@ -1 +1 @@
/esw/fips910/Builds/b0103a_1702.910
/esw/fips910/Builds/b0129a_1706.910
17 changes: 0 additions & 17 deletions src/build/citest/etc/patches/p9_system.act_pcie_patch

This file was deleted.

17 changes: 0 additions & 17 deletions src/build/citest/etc/patches/p9n_10.scomdef_with_pcie_patch

This file was deleted.

6 changes: 0 additions & 6 deletions src/build/citest/etc/patches/patchlist.txt
Expand Up @@ -5,9 +5,3 @@ Brief description of the problem or reason for patch
-Files: list of files
-Coreq: list of associated changes, e.g. workarounds.presimsetup

Need additional actions for PCIE scom init PMA reset
-RTC: 167283
-CMVC: 1014186
-Files: p9_system.act, p9n_10.scomdef
-Coreq: workarounds.postsimsetup

24 changes: 0 additions & 24 deletions src/build/citest/etc/workarounds.postsimsetup
Expand Up @@ -34,27 +34,3 @@
#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 $PROJECT_ROOT/src/build/citest/etc/patches/my_patch_File

### RTC 167283 - Patch begins
echo "+++ Updating p9n action file for pcie_scom_init"
echo "+++ SB: " $sb
echo "+++ BACKING_BUILD: " $BACKING_BUILD
echo "+++ PROJECT_ROOT: " $PROJECT_ROOT

### Update p9_system.act for pcie_scom_init
### Use this file in order to be able to checkin immediately, p9n.act is held up by other tracks
mkdir -p $sb/simu/data/cec-chip/
cp $BACKING_BUILD/src/simu/data/cec-chip/p9_system.act $sb/simu/data/cec-chip/
patch -p0 $sb/simu/data/cec-chip/p9_system.act $PROJECT_ROOT/src/build/citest/etc/patches/p9_system.act_pcie_patch

### Update p9n_10.scomdef for pcie_scom_init
echo "+++ Adding addresses to p9n_10.scomdef for pcie_scom_init"
mkdir -p $sb/engd/scomdef/
cp $BACKING_BUILD/src/engd/scomdef/p9n_10.scomdef $sb/engd/scomdef/
patch -p0 $sb/engd/scomdef/p9n_10.scomdef $PROJECT_ROOT/src/build/citest/etc/patches/p9n_10.scomdef_with_pcie_patch
echo "+++ Building indirect scom action with new p9n_10.scomdef"
cd $sb/simu/
mk -a -j32
#execute_in_sandbox "cd $sb/simu/ && mk -a -j32"
echo "+++ Done building"
### RTC 167283 - Patch ends

3 changes: 0 additions & 3 deletions src/build/citest/etc/workarounds.presimsetup
Expand Up @@ -35,6 +35,3 @@
#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 SIMICS workaround to support TPM reset"
sbex -t 1014303 -r fips910

0 comments on commit 135b23e

Please sign in to comment.