diff options
| author | Claus Michael Olsen <cmolsen@us.ibm.com> | 2016-03-30 14:35:25 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-05-04 14:18:19 -0400 |
| commit | e75563aa59cfb60b9b8d6c50e5db6b6eb3cf13bd (patch) | |
| tree | 4d691401db9aa03e51b6b187a968fb5590d7d2e7 /src/import/chips/p9/xip/p9_xip_image.h | |
| parent | 143af4d14b56f03c861b7be3aae7be71e71cde55 (diff) | |
| download | talos-hostboot-e75563aa59cfb60b9b8d6c50e5db6b6eb3cf13bd.tar.gz talos-hostboot-e75563aa59cfb60b9b8d6c50e5db6b6eb3cf13bd.zip | |
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
Diffstat (limited to 'src/import/chips/p9/xip/p9_xip_image.h')
| -rw-r--r-- | src/import/chips/p9/xip/p9_xip_image.h | 8 |
1 files changed, 6 insertions, 2 deletions
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" |
