p10_hcode: Partial support for parsing of traces in PM elog
Commit copies PM trexStringFiles from build directory to
PNOR stage directory as LID.
Signed-off-by: premjha2@in.ibm.com <premjha2@in.ibm.com>
diff --git a/openpower/package/hcode-p10/hcode-p10.mk b/openpower/package/hcode-p10/hcode-p10.mk
index 3d3eda6..469b98f 100644
--- a/openpower/package/hcode-p10/hcode-p10.mk
+++ b/openpower/package/hcode-p10/hcode-p10.mk
@@ -16,6 +16,9 @@
HW_IMAGE_BIN_PATH = output/images/hw_image
HW_IMAGE_BIN_NAME = p10.hw_image.bin
HCODE_IMAGE_BIN_NAME = p10.ref_image.bin
+QME20_TREXSTRING_PATH=hcode/qme_p10dd20/
+XGPE20_TREXSTRING_PATH=hcode/xgpe_p10dd20/
+PGPE20_TREXSTRING_PATH=hcode/pgpe_p10dd20/
CROSS_COMPILER_PATH=$(PPE42_GCC_BIN)
PPE_TOOL_PATH ?= $(CROSS_COMPILER_PATH)
@@ -39,8 +42,15 @@
CONFIG_IONV_FILE_LOCATION=$(STAGING_DIR)/hostboot_binaries/$(BINARY_IONV_FILENAME) \
CONFIG_INCLUDE_IONV=$(BR2_HCODE_INCLUDE_IONV) OPENPOWER_BUILD=1
+
define HCODE_P10_INSTALL_IMAGES_CMDS
mkdir -p $(STAGING_DIR)/hcode
+ mkdir -p $(STAGING_DIR)/$(QME20_TREXSTRING_PATH)
+ mkdir -p $(STAGING_DIR)/$(XGPE20_TREXSTRING_PATH)
+ mkdir -p $(STAGING_DIR)/$(PGPE20_TREXSTRING_PATH)
+ $(INSTALL) $(@D)/output/images/qme_p10dd20/trexStringFile $(STAGING_DIR)/$(QME20_TREXSTRING_PATH)
+ $(INSTALL) $(@D)/output/images/xgpe_p10dd20/trexStringFile $(STAGING_DIR)/$(XGPE20_TREXSTRING_PATH)
+ $(INSTALL) $(@D)/output/images/pgpe_p10dd20/trexStringFile $(STAGING_DIR)/$(PGPE20_TREXSTRING_PATH)
$(INSTALL) $(@D)/$(HW_IMAGE_BIN_PATH)/$(HW_IMAGE_BIN_NAME) $(STAGING_DIR)/hcode/$(HCODE_IMAGE_BIN_NAME)
endef
@@ -48,4 +58,5 @@
$(HCODE_P10_ENV_VARS) bash -c 'cd $(@D) && source ./env.bash && $(MAKE) '
endef
+
$(eval $(generic-package))
diff --git a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
index 423924c..e13923a 100644
--- a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
+++ b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
@@ -3,7 +3,6 @@
# openpower_pnor_p10
#
################################################################################
-
OPENPOWER_PNOR_P10_VERSION ?= 38b8d4759092a42d77a4f28939a0e3730f00e1f3
OPENPOWER_PNOR_P10_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_P10_VERSION))
@@ -157,6 +156,9 @@
$(INSTALL) -m 0644 -D $(STAGING_DIR)/sbe_sim_data/sbeStringFile_DD1 $(PNOR_SCRATCH_DIR)/SBESTRINGFILE.ipllid && \
$(INSTALL) -m 0644 -D $(STAGING_DIR)/sbe_sim_data/sbeVerificationStringFile $(PNOR_SCRATCH_DIR)/SBEVSTRINGFILE.ipllid && \
$(INSTALL) -m 0644 -D $(OCC_STAGING_DIR)/occStringFile $(PNOR_SCRATCH_DIR)/OCCSTRINGFILE.ipllid && \
+ $(INSTALL) -m 0644 -D $(STAGING_DIR)/hcode/qme_p10dd20/trexStringFile $(PNOR_SCRATCH_DIR)/QMESTRINGFILE.ipllid && \
+ $(INSTALL) -m 0644 -D $(STAGING_DIR)/hcode/xgpe_p10dd20/trexStringFile $(PNOR_SCRATCH_DIR)/XGPESTRINGFILE.ipllid && \
+ $(INSTALL) -m 0644 -D $(STAGING_DIR)/hcode/pgpe_p10dd20/trexStringFile $(PNOR_SCRATCH_DIR)/PGPESTRINGFILE.ipllid && \
$(TARGET_MAKE_ENV) $(@D)/makelidpkg \
$(BINARIES_DIR)/$(XML_VAR).ebmc_lids.tar.gz \
$(PNOR_SCRATCH_DIR) && \