diff options
author | Bill Hoffa <wghoffa@us.ibm.com> | 2017-10-03 10:41:09 -0500 |
---|---|---|
committer | William A. Bryan <wilbryan@us.ibm.com> | 2017-10-05 12:47:37 -0400 |
commit | ba4e81e804275ced6c1793f818e5fc1fd8d1ecae (patch) | |
tree | 28c91a0c74911f6ccf716ca01311a3a50d6c3897 | |
parent | 119f37bc1c1b9da19f80c4a8fbc04cb0120e1bdf (diff) | |
download | talos-occ-ba4e81e804275ced6c1793f818e5fc1fd8d1ecae.tar.gz talos-occ-ba4e81e804275ced6c1793f818e5fc1fd8d1ecae.zip |
Makefile Support for Openpower defining gpe1 binary location
Change-Id: Icb630bbf7b330a0ad4b4ac957f28eaa8d209df3e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/47079
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
-rwxr-xr-x | src/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 62ee4a4..c430e66 100755 --- a/src/Makefile +++ b/src/Makefile @@ -53,6 +53,10 @@ ifndef PK_SRCDIR export PK_SRCDIR = $(abspath ppe/pk) endif +ifndef GPE1_BIN_IMAGE_PATH +export GPE1_BIN_IMAGE_PATH = $(BASE_BINDIR) +endif + THASH = $(PPETRACEPP_DIR)/tracehash.pl OCC_405_IMAGE_NAME = occ_405 @@ -123,7 +127,7 @@ combineImage: $(NEEDED_IMAGES) $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(OCC_BOOTLOADER_NAME).bin \ $(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).bin \ $(OBJDIR)/$(OCC_GPE0_IMAGE_NAME)/$(OCC_GPE0_IMAGE_NAME).bin \ - $(BASE_BINDIR)/$(OCC_GPE1_IMAGE_NAME).bin \ + $(GPE1_BIN_IMAGE_PATH)/$(OCC_GPE1_IMAGE_NAME).bin \ t2 \ `md5sum $(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).bin | cut -c 1-4` endif |