summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Crowell <dcrowell@us.ibm.com>2015-02-28 11:54:47 -0600
committerA. Patrick Williams III <iawillia@us.ibm.com>2015-03-01 15:46:24 -0600
commitf8ff70afe17963e03abdbc113cf8c1f6198857c3 (patch)
treee4091aa7e6bdc667ca4e18c60cb6b0bc2eeaafba
parentecc3b60a9eab364053194072fd0ba57536d1a3a7 (diff)
downloadblackbird-hostboot-f8ff70afe17963e03abdbc113cf8c1f6198857c3.tar.gz
blackbird-hostboot-f8ff70afe17963e03abdbc113cf8c1f6198857c3.zip
Downgrade OCC Config Data Version if no FIR Master
Change-Id: Idc48298a9c3068da2216172da474ebff93eb3839 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16073 Tested-by: Jenkins Server Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r--src/include/usr/hwpf/hwp/occ/occ_common.H2
-rw-r--r--src/usr/hwpf/hwp/occ/occ_common.C3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/include/usr/hwpf/hwp/occ/occ_common.H b/src/include/usr/hwpf/hwp/occ/occ_common.H
index ca7ab397f..7ddb302b7 100644
--- a/src/include/usr/hwpf/hwp/occ/occ_common.H
+++ b/src/include/usr/hwpf/hwp/occ/occ_common.H
@@ -58,6 +58,8 @@ namespace HBOCC
enum
{
OccHostDataVersion = 3,
+ PRE_FIR_MASTER_VERSION = 2,
+
OCC_LIDID = 0x81e00430,
OCC_IBSCOM_RANGE_IN_MB = MEGABYTE,
diff --git a/src/usr/hwpf/hwp/occ/occ_common.C b/src/usr/hwpf/hwp/occ/occ_common.C
index 98e638286..037372778 100644
--- a/src/usr/hwpf/hwp/occ/occ_common.C
+++ b/src/usr/hwpf/hwp/occ/occ_common.C
@@ -170,6 +170,9 @@ namespace HBOCC
}
#else
config_data->firMaster = 0;
+ //force to an older version so we can support
+ // older levels of OCC
+ config_data->version = PRE_FIR_MASTER_VERSION;
#endif
TRACUCOMP( g_fapiTd,
OpenPOWER on IntegriCloud