Put editimgid into fsp.tar

Change-Id: Ia643b67e6f513b882754ec5a4d74e80f23622785
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49558
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 3 insertions, 4 deletions

diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index 46c32c504..adf24e579 100755
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -127,7 +127,6 @@ COPY_RENAME_FILES = \
     target_types_openpower.xml:src/usr/targeting/common/xmltohb/target_types_empty.xml:openpower \
     makefile:src/build/mkrules/hbfw/makefile:fsp \
     img/makefile:src/build/mkrules/hbfw/img/makefile:fsp \
-    img/editimgid:src/build/tools/editimgid:fsp \
     hbicore.bin:img/hbicore$(UNDERSCORE_TEST).bin:vpo \
     img/hostboot_bootloader.bin:img/hbibl.bin:fsp,openpower,vpo \
     img/hostboot_securerom.bin:img/securerom.bin:fsp,openpower,vpo \
@@ -289,6 +288,7 @@ fsp.tar_CONTENTS = \
     src/include/kernel/hbdescriptor.H \
     src/include/kernel/hbterminatetypes.H \
     src/build/tools/hwp_id.pl \
+    src/build/tools/editimgid \
     obj/genfiles/plugins/makefile:plugins/ \
     obj/genfiles/plugins/hbfwUdIds.H:plugins/ \
     src/include/usr/hbotcompid.H \
diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile
index a420b6e3b..d3bb9347c 100755
--- a/src/build/mkrules/hbfw/img/makefile
+++ b/src/build/mkrules/hbfw/img/makefile
@@ -59,7 +59,6 @@ SBEI_OBJPATH  = ${HBFW_OBJPATH:S/hbfw\/img/sbei\/sbfw\/img/g}
 ENGD_WOFPATH  = ${HBFW_OBJPATH:S/hbfw\/img/engd\/wofdata/g}
 ENGD_MEMDPATH = ${HBFW_OBJPATH:S/hbfw\/img/engd\/memd/g}
 HBFW_SIMPATH  = ${HBFW_OBJPATH:S/img/simics/g}
-HBFW_IMGPATH  = ${.PATH:M*img*}
 #################################################
 # Copy Hostboot binary images to obj dir to be grabbed
 # during build flash pass and consumption by HWSV.
@@ -74,7 +73,7 @@ hostboot_runtime_SYMS=hbirt.syms
 hostboot_securerom_SYMS=securerom.syms
 hostboot_bootloader_SYMS=hbibl.syms
 
-IMAGE_EDIT_PROGRAM=editimgid
+IMAGE_EDIT_PROGRAM = ${editimgid:P}
 
 # Input default images
 BOOTLDR_IMG = hostboot_bootloader.bin
@@ -202,7 +201,7 @@ BUILD_TYPE_PARAMS = --build-type fspbuild
 # rule to update hostboot image tags for custom CFM image, only enabled
 # when the enviroment variable CFM_TEST_IMAGE is populated
 update_image_id: cp_hbfiles validate_cfm_image_name
-	${HBFW_IMGPATH:F${IMAGE_EDIT_PROGRAM}} --binFile=${CFM_TEST_IMAGE:p} \
+	${IMAGE_EDIT_PROGRAM} --binFile=${CFM_TEST_IMAGE:p} \
         --symsFile=${HBFW_SIMPATH:F${${CFM_TEST_IMAGE:R}_SYMS}}
 
 # make sure the files exist - the perl script isnt all that smart