commit 3943c269f38be68287bc99f0ba08c513b9342a0c
author Roland Veloz <rveloz@us.ibm.com> Wed Jul 07 21:26:06 2021 -0500
committer Roland Veloz <rveloz@us.ibm.com> Mon Nov 08 21:18:22 2021 -0600
tree 8cb1f86472413a195ab3a1c0f81a43a5bbedf509
parent b97716e284a86664d8eb8d1f813ab1123d4ed16f

Updatng OP-Build to add package ibm-fw-proprietary-p10

Added package ~/openpower/package/ibm-fw-proprietary-p10 to
bring in the VPD ECC data algorithm files into the HB build.

Also made changes to file
openpower/package/hostboot-p10/hostboot-p10.mk to copy the VPD
ECC algorithm files if the ibm-fw-proprietary repo is present.

RTC: 263370
Signed-off-by: Roland Veloz <rveloz@us.ibm.com>

openpower/package/hostboot-p10/hostboot-p10.mk

diff --git a/openpower/package/hostboot-p10/hostboot-p10.mk b/openpower/package/hostboot-p10/hostboot-p10.mk
index ef460d5..2632aac 100644
--- a/openpower/package/hostboot-p10/hostboot-p10.mk
+++ b/openpower/package/hostboot-p10/hostboot-p10.mk
@@ -21,14 +21,31 @@
 
 FSP_TRACE_IMAGES_DIR = $(STAGING_DIR)/fsp-trace/
 
+# If BR2_PACKAGE_IBM_FW_PROPRIETARY_P10 is defined then
+#  * Include repo ibm-fw-proprietary-p10 as a dependency (HOSTBOOT_P10_DEPENDENCIES)
+#    to get access to any needed IBM proprietary files.
+#  * Create a variable (IBM_FW_PROPRIETARY_P10_BUILD_DIR) to point to the location
+#    of the ibm-fw-proprietary-p10 repo for easy access to any files needed.
+ifeq ($(BR2_PACKAGE_IBM_FW_PROPRIETARY_P10),y)
+    HOSTBOOT_P10_DEPENDENCIES += ibm-fw-proprietary-p10
+    IBM_FW_PROPRIETARY_P10_BUILD_DIR = $(BUILD_DIR)/ibm-fw-proprietary-p10-$(IBM_FW_PROPRIETARY_P10_VERSION)
+endif
+
 # TODO: WORKAROUND: Currently the git clone causes a bad symlink
 # to be created for src/include/usr/tracinterface.H; so delete it and rebuild it
 # manually
+# Copy the VPD ECC algorithm files from the repo ibm-fw-proprietary-p10 to hostboot's
+# 'src/user/vpd' directory if environment variable 'IBM_FW_PROPRIETARY_P10_BUILD_DIR'
+# is defined.  Whether the VPD ECC algorithm files get compiled or not will be determined
+# by flag 'COMPILE_VPD_ECC_ALGORITHMS' within file openpower/configs/hostboot/<systemx>.config.
 define HOSTBOOT_P10_BUILD_CMDS
         $(HOSTBOOT_P10_ENV_VARS) bash -c 'cd $(@D) \
                                           && if ! cmp --quiet src/include/usr/trace/interface.H src/include/usr/tracinterface.H ; then \
                                                  rm -f src/include/usr/tracinterface.H && cp src/include/usr/trace/interface.H src/include/usr/tracinterface.H ; \
                                              fi \
+                                          && if [ -n "$(IBM_FW_PROPRIETARY_P10_BUILD_DIR)" ] ; then \
+                                                 cp $(IBM_FW_PROPRIETARY_P10_BUILD_DIR)/vpd/* src/usr/vpd ; \
+                                             fi \
                                           && source ./env.bash && $(MAKE)'
 endef