summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaus Michael Olsen <cmolsen@us.ibm.com>2017-09-21 22:58:58 -0500
committerSachin Gupta <sgupta2m@in.ibm.com>2017-11-07 09:58:16 -0500
commit2551c3e8b1d88090424723d0abc1b4d97de842eb (patch)
tree81519de947ca22cf1f0eace696fc38673bdfaa9b
parentdbb8adce3d255b9ff0e2c7f6de019d1927cd635d (diff)
downloadtalos-sbe-2551c3e8b1d88090424723d0abc1b4d97de842eb.tar.gz
talos-sbe-2551c3e8b1d88090424723d0abc1b4d97de842eb.zip
Overlays and multi-DD XIP related updates to xip_image and dd_container
to support WIN32 for manu team. Also, - various updates to dd_container error handling, - improved DD support query checking. Change-Id: Ic01923def3c370f7991917a3f7d2ae3b36dd87dc Original-Change-Id: I706e56258894c3453cf01aa1a637fe888af1db00 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46596 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Richard J. Knight <rjknight@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49298 Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
-rw-r--r--src/import/chips/p9/utils/imageProcs/p9_dd_container.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/import/chips/p9/utils/imageProcs/p9_dd_container.h b/src/import/chips/p9/utils/imageProcs/p9_dd_container.h
index 7026a40c..ee288ab9 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_dd_container.h
+++ b/src/import/chips/p9/utils/imageProcs/p9_dd_container.h
@@ -26,16 +26,20 @@
#ifndef _P9_DD_CONTAINER_H_
#define _P9_DD_CONTAINER_H_
-#include <stdint.h>
+#ifdef WIN32
+ #include "win32_stdint.h"
+#else
+ #include <stdint.h>
+#endif
-#define P9_DD_CONTAINER_MAGIC 0x4444434F // "DDCO"
+#define DD_CONTAINER_MAGIC 0x4444434F // "DDCO"
-#define P9_DD_SUCCESS 0
-#define P9_DD_FAILURE_BROKEN 1
-#define P9_DD_FAILURE_NOMEM 2
-#define P9_DD_FAILURE_NOT_FOUND 3
-#define P9_DD_FAILURE_DOES_NOT_EXIST 4
-#define P9_DD_FAILURE_DUPLICATE 5
+#define DDCO_SUCCESS 0
+#define DDCO_FAILURE_MAGIC_NOT_FOUND 1
+#define DDCO_FAILURE_NOMEM 2
+#define DDCO_DDLEVEL_NOT_FOUND 3
+#define DDCO_DDCO_DOES_NOT_EXIST 4
+#define DDCO_DUPLICATE_DDLEVEL 5
// header for each dd level block inside container
struct p9_dd_block
@@ -62,9 +66,6 @@ struct p9_dd_iter
uint8_t iv_idx;
};
-// initialisation of iterator
-#define P9_DD_ITER_INIT(dd_cont) { .iv_cont = (dd_cont), .iv_idx = 0 }
-
#ifdef __cplusplus
extern "C" {
#endif
OpenPOWER on IntegriCloud