diff options
| author | Claus Michael Olsen <cmolsen@us.ibm.com> | 2017-03-01 08:26:00 -0600 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2017-10-23 17:10:35 -0500 |
| commit | d62ab83770ab81750150d95235c75f6e6fa31bca (patch) | |
| tree | 3a065b77b9c11b5af2210f430a5c1188afd66165 /import/chips/p9/xip | |
| parent | f13b47c555ae5a49b409d556b3ee41ea352d0326 (diff) | |
| download | talos-hcode-d62ab83770ab81750150d95235c75f6e6fa31bca.tar.gz talos-hcode-d62ab83770ab81750150d95235c75f6e6fa31bca.zip | |
xip_tool: Combining two EKB vs PPE repo directives.
- Changed XIP_TOOL_ENABLE_DISSECT to __PPE__
Change-Id: Ia04f3f77eb44a3dc24c8d248a6c1184cb9e2f2f4
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37258
Reviewed-by: Sumit Kumar <sumit_kumar@in.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Diffstat (limited to 'import/chips/p9/xip')
| -rw-r--r-- | import/chips/p9/xip/p9_xip_tool.C | 15 | ||||
| -rw-r--r-- | import/chips/p9/xip/p9_xip_tool.mk | 1 |
2 files changed, 8 insertions, 8 deletions
diff --git a/import/chips/p9/xip/p9_xip_tool.C b/import/chips/p9/xip/p9_xip_tool.C index a7f8afb9..68fede1f 100644 --- a/import/chips/p9/xip/p9_xip_tool.C +++ b/import/chips/p9/xip/p9_xip_tool.C @@ -44,7 +44,7 @@ #undef P9_XIP_TOOL_VERBOSE #include "p9_xip_image.h" -#ifdef XIP_TOOL_ENABLE_DISSECT // Needed on ppe side to avoid TOR API +#ifndef __PPE__ // Needed on ppe side to avoid TOR API #include "p9_tor.H" #include "p9_scan_compression.H" using namespace P9_TOR; @@ -1722,7 +1722,7 @@ TEST(void* io_image, const int i_argc, const char** i_argv) } -#ifdef XIP_TOOL_ENABLE_DISSECT // Needed on the ppe side to avoid TOR API +#ifndef __PPE__ // Needed on the ppe side to avoid TOR API // This function prints out the raw decompressed ring content in the same @@ -2334,7 +2334,7 @@ int check_sbe_ring_section_size( void* i_hwImage, uint32_t i_maxSize ) { int rc = 0; -#ifndef __PPE__ +#ifndef __PPE__ // Needed on ppe side to avoid TOR API P9XipSection l_ringsSection; @@ -2495,13 +2495,14 @@ command(const char* i_imageFile, const int i_argc, const char** i_argv, const ui { openAndMapReadOnly(i_imageFile, &fd, &image, i_maskIgnores); -#ifdef XIP_TOOL_ENABLE_DISSECT // Needed on ppe side to avoid TOR API +#ifndef __PPE__ // Needed on ppe side to avoid TOR API rc = dissectRingSection(image, i_argc - 1, &(i_argv[1])); #else fprintf(stderr, "\n"); - fprintf(stderr, "-------------------------------\n"); - fprintf(stderr, " dissect feature not supported \n"); - fprintf(stderr, "-------------------------------\n\n"); + fprintf(stderr, "---------------------------------------------\n"); + fprintf(stderr, " dissect feature not supported in PPE repo \n"); + fprintf(stderr, " => Use EKB version of p9_xip_tool \n"); + fprintf(stderr, "---------------------------------------------\n\n"); exit(1); #endif diff --git a/import/chips/p9/xip/p9_xip_tool.mk b/import/chips/p9/xip/p9_xip_tool.mk index 26a863ab..3d1d45ef 100644 --- a/import/chips/p9/xip/p9_xip_tool.mk +++ b/import/chips/p9/xip/p9_xip_tool.mk @@ -23,7 +23,6 @@ # # IBM_PROLOG_END_TAG EXE = p9_xip_tool -$(EXE)_COMMONFLAGS += -DXIP_TOOL_ENABLE_DISSECT OBJS += $(EXE).o $(EXE)_DEPLIBS += p9_xip_image p9_tor p9_ringId p9_scan_compression $(call ADD_EXE_INCDIR,$(EXE),$(ROOTPATH)/chips/p9/utils/imageProcs) |
