summaryrefslogtreecommitdiffstats
path: root/src/build
diff options
context:
space:
mode:
authorMike Baiocchi <baiocchi@us.ibm.com>2013-11-12 15:47:53 -0600
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-11-12 16:35:28 -0600
commitf9dfc79a5eed1b13b90101e5e781abb67bf1e89e (patch)
treea4d998f6c82157d78c86a71ce480eb7ec1853aa8 /src/build
parente115feb00a319dcafce3774375edcf8f686a80ef (diff)
downloadtalos-hostboot-f9dfc79a5eed1b13b90101e5e781abb67bf1e89e.tar.gz
talos-hostboot-f9dfc79a5eed1b13b90101e5e781abb67bf1e89e.zip
Updating bbuild to b1106a_1345.810
This is a build that was officially released. I also removed the one workaround for simics support. Change-Id: I08d94a5560124d9da8f95d8604dda89cdfd47c61 RTC: 89387 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7205 Tested-by: Jenkins Server Reviewed-by: Brian H. Horton <brianh@linux.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build')
-rw-r--r--src/build/citest/etc/bbuild2
-rw-r--r--src/build/citest/etc/patches/p8.act_dmi_io_run_training_patch130
-rw-r--r--src/build/citest/etc/patches/patchlist.txt6
-rw-r--r--src/build/citest/etc/patches/s1.act_dmi_io_run_training_patch66
-rwxr-xr-xsrc/build/citest/etc/workarounds.postsimsetup9
5 files changed, 1 insertions, 212 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index 5b775b751..e2fbd5fb2 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips810/Builds/b0925a_1339.810/
+/esw/fips810/Builds/b1106a_1345.810/
diff --git a/src/build/citest/etc/patches/p8.act_dmi_io_run_training_patch b/src/build/citest/etc/patches/p8.act_dmi_io_run_training_patch
deleted file mode 100644
index 4bf8f926b..000000000
--- a/src/build/citest/etc/patches/p8.act_dmi_io_run_training_patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- p8.act_b0925a 2013-10-24 07:49:43.988199121 -0500
-+++ p8.act_modified 2013-10-24 09:44:02.000000000 -0500
-@@ -761,6 +761,7 @@
- WATCH=[INDSCOM_0x02011A3F(0x00088060)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort0)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088060)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088860)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088860)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -779,6 +780,7 @@
- WATCH=[INDSCOM_0x02011A3F(0x00088060)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort0)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088060)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088860)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088860)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -806,6 +808,7 @@
- WATCH=[INDSCOM_0x02011A3F(0x00088040)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort1)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088040)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088840)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088840)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -824,6 +827,7 @@
- WATCH=[INDSCOM_0x02011A3F(0x00088040)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort1)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088040)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088840)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088840)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -851,6 +855,7 @@
- WATCH=[INDSCOM_0x02011A3F(0x00088020)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort3)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088020)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088820)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088820)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -869,6 +874,7 @@
- WATCH=[INDSCOM_0x02011A3F(0x00088020)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort3)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088020)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088820)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088820)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -896,6 +902,7 @@
- WATCH=[INDSCOM_0x02011A3F(0x00088000)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort2)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088000)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088800)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088800)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -914,6 +921,7 @@
- WATCH=[INDSCOM_0x02011A3F(0x00088000)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort2)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011A3F(0x00088000)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088800)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011A3F(0x00088800)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -940,6 +948,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088060)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort4)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088060)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088860)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088860)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -956,6 +965,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088060)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort4)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088060)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088860)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088860)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -980,6 +990,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088040)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort5)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088040)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088840)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088840)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -996,6 +1007,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088040)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort5)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088040)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088840)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088840)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -1020,6 +1032,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088020)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort7)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088020)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088820)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088820)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -1036,6 +1049,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088020)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort7)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088020)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088820)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088820)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -1060,6 +1074,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088000)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort6)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088000)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088800)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088800)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -1076,6 +1091,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088000)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort6)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088000)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088800)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088800)] OP=[BIT,ON] BIT=[50]
- }
-
diff --git a/src/build/citest/etc/patches/patchlist.txt b/src/build/citest/etc/patches/patchlist.txt
index 5aac1fd75..6f72600b5 100644
--- a/src/build/citest/etc/patches/patchlist.txt
+++ b/src/build/citest/etc/patches/patchlist.txt
@@ -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
-Update action file for dmi_io_run_training to work with io_dccal.C v1.26
--RTC: Task 89387 used to remove this patch
--CMVC: Feature SW231052/903906 will be used to check the change into fips810
--Files: p8.act, s1.act
--Coreq: workarounds.postsimsetup
-
diff --git a/src/build/citest/etc/patches/s1.act_dmi_io_run_training_patch b/src/build/citest/etc/patches/s1.act_dmi_io_run_training_patch
deleted file mode 100644
index 565f3acc3..000000000
--- a/src/build/citest/etc/patches/s1.act_dmi_io_run_training_patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- s1.act_b0925a 2013-10-24 08:41:58.714308973 -0500
-+++ s1.act_modified 2013-10-24 09:47:24.000000000 -0500
-@@ -402,6 +402,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088060)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort4)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088060)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088860)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088860)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -418,6 +419,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088060)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort4)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088060)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088860)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088860)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -442,6 +444,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088040)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort5)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088040)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088840)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088840)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -458,6 +461,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088040)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort5)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088040)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088840)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088840)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -482,6 +486,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088020)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort7)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088020)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088820)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088820)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -498,6 +503,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088020)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort7)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088020)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088820)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088820)] OP=[BIT,ON] BIT=[50]
- }
-
-@@ -522,6 +528,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088000)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort6)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[48]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088000)] OP=[BIT,ON] BIT=[48]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088800)] OP=[BIT,OFF] BIT=[56]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088800)] OP=[BIT,ON] BIT=[48]
- }
-
-@@ -538,6 +545,7 @@
- WATCH=[INDSCOM_0x02011E3F(0x00088000)] # start trigger register
- CAUSE: TARGET=[ALIAS(mymcPort6)INDSCOM_0x0201043F(0x00088000)] OP=[BIT,ON] BIT=[50]
- CAUSE: TARGET=[INDSCOM_0x02011E3F(0x00088000)] OP=[BIT,ON] BIT=[50]
-+ EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088800)] OP=[BIT,OFF] BIT=[58]
- EFFECT: TARGET=[INDSCOM_0x02011E3F(0x00088800)] OP=[BIT,ON] BIT=[50]
- }
-
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
index 2b74736b4..d335f723b 100755
--- a/src/build/citest/etc/workarounds.postsimsetup
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -32,12 +32,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 $HOSTBOOTROOT/src/build/citest/etc/patches/my_patch_File
-
-### Update s1.act for dmi_io_run_training
-echo "+++ Update s1.act for dmi_io_run_training"
-mkdir -p $sb/simu/data/cec-chip/
-cp $BACKING_BUILD/src/simu/data/cec-chip/s1.act $sb/simu/data/cec-chip
-cp $BACKING_BUILD/src/simu/data/cec-chip/p8.act $sb/simu/data/cec-chip
-patch -p0 $sb/simu/data/cec-chip/s1.act $HOSTBOOTROOT/src/build/citest/etc/patches/s1.act_dmi_io_run_training_patch
-patch -p0 $sb/simu/data/cec-chip/p8.act $HOSTBOOTROOT/src/build/citest/etc/patches/p8.act_dmi_io_run_training_patch
-
OpenPOWER on IntegriCloud