From 08dfcff3d25d6467e188361f5646b1f9cc5f6ff5 Mon Sep 17 00:00:00 2001 From: Claus Michael Olsen Date: Wed, 2 Nov 2016 08:32:16 -0500 Subject: xip_tool: Minor cleanup Change-Id: Ida5384bcd899313b9f822261a6aa1d94500e87b0 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32109 Tested-by: Hostboot CI Reviewed-by: Martin Peschke Reviewed-by: Richard J. Knight Tested-by: Jenkins Server Tested-by: PPE CI Reviewed-by: Prachi Gupta Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/32120 Reviewed-by: Hostboot Team Tested-by: FSP CI Jenkins Reviewed-by: Sachin Gupta --- src/import/chips/p9/xip/p9_xip_tool.C | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/import/chips/p9/xip/p9_xip_tool.C') diff --git a/src/import/chips/p9/xip/p9_xip_tool.C b/src/import/chips/p9/xip/p9_xip_tool.C index e292e5e8..80a2b1b6 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 @@ #define __PPE__ #include "p9_xip_image.h" -#ifdef XIP_TOOL_ENABLE_DISSECT +#ifdef XIP_TOOL_ENABLE_DISSECT // Needed on ppe side to avoid TOR API #include "p9_tor.H" #include "p9_scan_compression.H" using namespace P9_TOR; @@ -1713,10 +1713,9 @@ 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 -#ifdef XIP_TOOL_ENABLE_DISSECT - -// This should be improved, though. Not really our responsibility defining this. +//@FIXME: This should be improved. Probably defined somewhere else. #define CHIPLET_ID_MAX (uint8_t)0x37 /// Function: dissectRingSectionTor() @@ -2368,7 +2367,7 @@ 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 +#ifdef XIP_TOOL_ENABLE_DISSECT // Needed on ppe side to avoid TOR API rc = dissectRingSection(image, i_argc - 1, &(i_argv[1])); #else fprintf(stderr, "\n"); -- cgit v1.2.1