diff options
| author | Chris Cain <cjcain@us.ibm.com> | 2017-10-25 16:17:52 -0500 |
|---|---|---|
| committer | Christopher J. Cain <cjcain@us.ibm.com> | 2017-10-25 17:43:28 -0400 |
| commit | 7449acdc8bfe422483bf9de7d9a9723156e4dd51 (patch) | |
| tree | c30c79ab9edd5e8263ecb84f6346b2b6456bcb0c | |
| parent | 20879cb32111afd06cc7db6ea1fd0aaf3ef32ee6 (diff) | |
| download | talos-occ-7449acdc8bfe422483bf9de7d9a9723156e4dd51.tar.gz talos-occ-7449acdc8bfe422483bf9de7d9a9723156e4dd51.zip | |
Prevent shared GPE data setup on boot
Change-Id: Id3cf9c86d6996efd39fdd2290bbb2cda7cc2ef49
CQ: SW406044
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48839
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
| -rwxr-xr-x | src/occ_405/main.c | 5 | ||||
| -rwxr-xr-x | src/occ_405/occbuildname.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/occ_405/main.c b/src/occ_405/main.c index 82dfdf1..c8503b3 100755 --- a/src/occ_405/main.c +++ b/src/occ_405/main.c @@ -1304,7 +1304,10 @@ void occ_ipc_setup() MAIN_TRAC_INFO("GPE's taken out of reset"); - set_shared_gpe_data(); + if (!G_ipl_time) + { + set_shared_gpe_data(); + } }while(0); diff --git a/src/occ_405/occbuildname.c b/src/occ_405/occbuildname.c index 100ecb6..d7dca3a 100755 --- a/src/occ_405/occbuildname.c +++ b/src/occ_405/occbuildname.c @@ -34,6 +34,6 @@ volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = #else -volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/ "op_occ_171020b\0" /*</BuildName>*/ ; +volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/ "op_occ_171025a\0" /*</BuildName>*/ ; #endif |
