diff options
| author | Mike Baiocchi <baiocchi@us.ibm.com> | 2014-05-30 13:10:47 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-06-30 19:33:18 -0500 |
| commit | 61a956f980a4be2f19d33067236018e7efd074e7 (patch) | |
| tree | 40041d694d9b1037ff9eb861bfab589265da1752 /src/usr/sbe/test/sbeupdatetest.H | |
| parent | 3b65dfb45938d0e864749fe97f044c275f56f3db (diff) | |
| download | talos-hostboot-61a956f980a4be2f19d33067236018e7efd074e7.tar.gz talos-hostboot-61a956f980a4be2f19d33067236018e7efd074e7.zip | |
Merge SBE commits from Stradale
This commit adds hooks into the SBE Update code to handle different
modes of operation. It uses the new configuration file setup.
Change-Id: I7977664cd54e0f900aece898f6b189d60f856417
RTC: 97484
Origin: Google Shared Technology
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11349
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/sbe/test/sbeupdatetest.H')
| -rw-r--r-- | src/usr/sbe/test/sbeupdatetest.H | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/usr/sbe/test/sbeupdatetest.H b/src/usr/sbe/test/sbeupdatetest.H index 3e5460dab..4ab0150b2 100644 --- a/src/usr/sbe/test/sbeupdatetest.H +++ b/src/usr/sbe/test/sbeupdatetest.H @@ -5,7 +5,10 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013,2014 */ +/* Contributors Listed Below - COPYRIGHT 2013,2014 */ +/* [+] Google Inc. */ +/* [+] 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. */ @@ -35,6 +38,7 @@ #include <devicefw/driverif.H> #include <vfs/vfs.H> #include <targeting/common/utilFilter.H> +#include <config.h> #include <sbe/sbeif.H> #include "../sbe_update.H" @@ -586,7 +590,7 @@ class SBEUpdateTest: public CxxTest::TestSuite } testData[] = { - +#ifdef CONFIG_SBE_UPDATE_SEQUENTIAL // case 0xE0: cur=temp, cur=dirty, alt=dirty // Arbitrarily set cur side to 0 (therefore perm set to 1) // - update alt=1 @@ -597,7 +601,6 @@ class SBEUpdateTest: public CxxTest::TestSuite (DO_UPDATE|IPL_RESTART|UPDATE_MVPD|UPDATE_SBE), EEPROM::SBE_BACKUP, 0x40 }, - // case 0xC0: cur=temp, cur=dirty, alt=dirty // Arbitrarily set cur side to 1 (therefore perm set to 0) // - update alt=0 @@ -670,7 +673,7 @@ class SBEUpdateTest: public CxxTest::TestSuite { 0x01, SBE_SEEPROM0, 0x00, static_cast<sbeUpdateActions_t>(CLEAR_ACTIONS), EEPROM::LAST_CHIP_TYPE, 0x00 }, - +#endif // SBE_UPDATE_SEQUENTIAL }; const uint32_t NUM_CMDS = sizeof(testData)/sizeof(testData[0]); |
