From 6f8b085ed6ce50b4d835db4c277ba84f2117d92e Mon Sep 17 00:00:00 2001
From: Claus Michael Olsen <cmolsen@us.ibm.com>
Date: Sun, 11 Sep 2016 12:12:09 -0500
Subject: xip_customize: MVPD compatible file set.

Change-Id: Ib3b7aeb8045a28ca05d33370c1ef1dcb9ba1fb64
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29448
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Michael C. Sgro <mcs793@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29449
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
---
 src/import/chips/p9/xip/p9_xip_image.c | 17 ++++++++---------
 src/import/chips/p9/xip/p9_xip_image.h |  6 +++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/import/chips/p9/xip')

diff --git a/src/import/chips/p9/xip/p9_xip_image.c b/src/import/chips/p9/xip/p9_xip_image.c
index ed89d0fe..548acc1a 100644
--- a/src/import/chips/p9/xip/p9_xip_image.c
+++ b/src/import/chips/p9/xip/p9_xip_image.c
@@ -37,20 +37,19 @@
 /// ensure that no memory outside of the putative bounds of the image is ever
 /// referenced during validation.
 
-#ifndef PLIC_MODULE
-    #include <stddef.h>
-    #include <stdint.h>
-    #include <stdlib.h>
-    #include <string.h>
-#endif // PLIC_MODULE
-
 #include <stddef.h>
-#include <stdint.h>
+#ifdef _WIN32
+    #include "win32_stdint.h"
+    #include "endian.h"
+#else
+    #include <stdint.h>
+    #include <endian.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
-#include <endian.h>
 #include "p9_xip_image.h"
 
+
 ////////////////////////////////////////////////////////////////////////////
 // Local Functions
 ////////////////////////////////////////////////////////////////////////////
diff --git a/src/import/chips/p9/xip/p9_xip_image.h b/src/import/chips/p9/xip/p9_xip_image.h
index 6ec845f8..14143cce 100644
--- a/src/import/chips/p9/xip/p9_xip_image.h
+++ b/src/import/chips/p9/xip/p9_xip_image.h
@@ -244,8 +244,12 @@ typedef enum {
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef __ASSEMBLER__
-#include <stddef.h>
+#ifdef _WIN32
+#include "win32_stdint.h"
+#else
 #include <stdint.h>
+#endif
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
-- 
cgit v1.2.1