diff options
| author | Claus Michael Olsen <cmolsen@us.ibm.com> | 2017-03-01 08:26:00 -0600 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2017-03-07 06:24:51 -0500 |
| commit | 935272f76f4c3dc7b92d789c21e4a3c8e181a2c5 (patch) | |
| tree | 5d4299def89416fdc57c5a766e3c84096ad86729 /src/import/chips/p9 | |
| parent | 11505568a541fd15224215efd29222e76cd70cd3 (diff) | |
| download | talos-sbe-935272f76f4c3dc7b92d789c21e4a3c8e181a2c5.tar.gz talos-sbe-935272f76f4c3dc7b92d789c21e4a3c8e181a2c5.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>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37260
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/import/chips/p9')
| -rw-r--r-- | src/import/chips/p9/xip/p9_xip_tool.C | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/import/chips/p9/xip/p9_xip_tool.C b/src/import/chips/p9/xip/p9_xip_tool.C index ee27ec1e..ab109c87 100644 --- a/src/import/chips/p9/xip/p9_xip_tool.C +++ b/src/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 |
