Relocation of header files to ./tools/imageProcs directory and associated

changes to various *.mk files to point to new location as well as minor
changes to xip_tool.
Removed p9_ring_apply.mk because it isn't needed at this point anyway
and causes Jenkins to fail. Giri is checking this file plus associated
corrections to the other  p9_ring_apply.* files.
Added and updated p9_xip_image.h, and updated p9_scan_compression.H,
according to commit 22997.

Change-Id: I888dc2fccf92d3173ae45870b7cdefeb29757058
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22682
Tested-by: Hostboot CI
Tested-by: Jenkins Server
Tested-by: PPE CI
Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22688
Tested-by: FSP CI Jenkins

3 files changed, 7 insertions, 66 deletions

diff --git a/src/import/chips/p9/xip/fapi_sbe_common.H b/src/import/chips/p9/xip/fapi_sbe_common.H
deleted file mode 100644
index d125eeade..000000000
--- a/src/import/chips/p9/xip/fapi_sbe_common.H
+++ /dev/null
@@ -1,60 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: chips/p9/xip/fapi_sbe_common.H $                              */
-/*                                                                        */
-/* IBM CONFIDENTIAL                                                       */
-/*                                                                        */
-/* EKB Project                                                            */
-/*                                                                        */
-/* COPYRIGHT 2015,2016                                                    */
-/* [+] International Business Machines Corp.                              */
-/*                                                                        */
-/*                                                                        */
-/* The source code for this program is not published or otherwise         */
-/* divested of its trade secrets, irrespective of what has been           */
-/* deposited with the U.S. Copyright Office.                              */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-
-/// \file fapi_sbe_common.H
-/// \brief provides several preprocessor macros used functions in fixed secion.
-///
-/// Several preprocessor macros are required to have different definitions in
-/// C, C++ and SBE assembly procedures.  These common forms are collected here.
-
-#ifndef __FAPI_SBE_COMMON_H
-#define __FAPI_SBE_COMMON_H
-
-/// Several preprocessor macros are required to have different definitions in
-/// C, C++ and SBE assembly procedures.  These common forms are collected here.
-
-#if defined __ASSEMBLER__
-
-    #define CONST_UINT8_T(name, expr) .set name, (expr)
-    #define CONST_UINT32_T(name, expr) .set name, (expr)
-    #define CONST_UINT64_T(name, expr) .set name, (expr)
-
-    #define ULL(x) x
-
-#elif defined __cplusplus
-
-    #include <stdint.h>
-
-    #define CONST_UINT8_T(name, expr) const uint8_t name = (expr);
-    #define CONST_UINT32_T(name, expr) const uint32_t name = (expr);
-    #define CONST_UINT64_T(name, expr) const uint64_t name = (expr);
-
-    #define ULL(x) x##ull
-
-#else // C code
-
-    // CONST_UINT[8,3,64]_T() can't be used in C code/headers; Use
-    //
-    //     #define <symbol> <value> [ or ULL(<value>) for 64-bit constants
-
-    #define ULL(x) x##ull
-
-#endif  // __ASSEMBLER__
-
-#endif  // __FAPI_SBE_COMMON_H
diff --git a/src/import/chips/p9/xip/p9_xip_image.h b/src/import/chips/p9/xip/p9_xip_image.h
index 6c9ff69db..6f00e92c2 100644
--- a/src/import/chips/p9/xip/p9_xip_image.h
+++ b/src/import/chips/p9/xip/p9_xip_image.h
@@ -29,8 +29,6 @@
 #ifndef __P9_XIP_IMAGE_H
 #define __P9_XIP_IMAGE_H
 
-#include "fapi_sbe_common.H"
-
 /// Current version (fields, layout, sections) of the P9_XIP header
 ///
 /// If any changes are made to this file or to p9_xip_header.H, please update
@@ -46,6 +44,12 @@
 ///
 /// @{
 
+#ifdef __ASSEMBLER__
+    #define ULL(x) x
+#else
+    #define ULL(x) x##ull
+#endif
+
 #define P9_XIP_MAGIC             0x58495020           // "XIP "
 #define P9_XIP_MAGIC_BASE    ULL(0x5849502042415345)  // "XIP BASE"
 #define P9_XIP_MAGIC_SEEPROM ULL(0x584950205345504d)  // "XIP SEPM"
diff --git a/src/import/chips/p9/xip/p9_xip_image.mk b/src/import/chips/p9/xip/p9_xip_image.mk
index f4534cdbd..004534e82 100644
--- a/src/import/chips/p9/xip/p9_xip_image.mk
+++ b/src/import/chips/p9/xip/p9_xip_image.mk
@@ -16,10 +16,7 @@
 # deposited with the U.S. Copyright Office.
 #
 # IBM_PROLOG_END_TAG
-
 PROCEDURE = p9_xip_image
-
-lib$(PROCEDURE)_COMMONFLAGS = -DDEBUG_P9_XIP_IMAGE=1
-
+lib$(PROCEDURE)_COMMONFLAGS += -DDEBUG_P9_XIP_IMAGE=1
 $(call BUILD_PROCEDURE)