summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Cprek <smcprek@us.ibm.com>2014-10-10 11:28:53 -0500
committerAndrew J. Geissler <andrewg@us.ibm.com>2014-10-21 14:16:33 -0500
commit3b3b3a82d88f9008b5c36818670c45ad003943e8 (patch)
tree312c372b9f64751eaab87c5bba6d036b8d852abd
parent198e80b53d58c506c0db4d5de4eb5b8e4bed2aed (diff)
downloadtalos-hostboot-3b3b3a82d88f9008b5c36818670c45ad003943e8.tar.gz
talos-hostboot-3b3b3a82d88f9008b5c36818670c45ad003943e8.zip
Update bbuild to 830 and remove patches
Patch removed - attrPredicate.patch Change-Id: I0bb04d12293252df596102fa7d13b27d04936fe6 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13928 Tested-by: Jenkins Server Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
-rw-r--r--src/build/citest/etc/bbuild2
-rw-r--r--src/build/citest/etc/patches/attrPredicate.patch15
-rwxr-xr-xsrc/build/citest/etc/workarounds.presimsetup6
3 files changed, 1 insertions, 22 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index e7e9f3ed5..47320fbdf 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips820/Builds/built/
+/esw/fips830/Builds/built/
diff --git a/src/build/citest/etc/patches/attrPredicate.patch b/src/build/citest/etc/patches/attrPredicate.patch
deleted file mode 100644
index 70c66d7d5..000000000
--- a/src/build/citest/etc/patches/attrPredicate.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-49a50,51
-> # F 931324 smcprek Sep 04, 2014 Add new predicateattrtanktargetpos.H
-> # and support for targreasoncodes.H
-171,172c173,175
-< predicateisnonfunctional.H
-<
----
-> predicateisnonfunctional.H \
-> predicateattrtanktargetpos.H
->
-187c190,191
-< attributeTank.H
----
-> attributeTank.H \
-> targreasoncodes.H
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index 340407304..9c0e730b6 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -50,12 +50,6 @@ grep -v "GFW_P8_HB_UNSECURE_OFFSET" \
echo "SETENV GFW_P8_HB_UNSECURE_OFFSET 58720256" >> \
$sb/simu/configs/P8_VENICE.config
-echo "+++ Patching attrPredicate.patch for BMC Attr Override."
-mkdir -p $sb/hbfw/fsp/targeting
-cp $BACKING_BUILD/src/hbfw/fsp/targeting/makefile $sb/hbfw/fsp/targeting
-patch $sb/hbfw/fsp/targeting/makefile \
- ${HOSTBOOTROOT}/src/build/citest/etc/patches/attrPredicate.patch
-
echo "+++ Patching attribute_types_fsp.xml for HTMGT attribute support."
mkdir -p $sb/hbfw/fsp/targeting/xmltohb
OpenPOWER on IntegriCloud