commit 821ce2d7e626264a40fd0f0ba8454cf1a18774a4
author Zach Clark <zach@ibm.com> Mon Feb 07 13:26:15 2022 -0600
committer Zach Clark <zach@ibm.com> Tue Feb 08 16:41:24 2022 -0600
tree 177052055ca66cab80dbcf09cdb40543af9be9d6
parent 246f048261aafc7e08fbef5daa56bb153eb2011b

Update the locations of the ECC implementation files for Hostboot

This commit changes the location where the IBM proprietary ECC
implementation files are expected to appear in the Hostboot project.

The files are still copied into the old location for
backwards-compatibility.

Signed-off-by: Zach Clark <zach@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 2632aac..2bbc8ef 100644
--- a/openpower/package/hostboot-p10/hostboot-p10.mk
+++ b/openpower/package/hostboot-p10/hostboot-p10.mk
@@ -26,9 +26,16 @@
 #    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.
+# Note that if libecc_static.a exists in the $(HOSTBOOT_PRECOMPILED_LIBRARIES)
+# directory then we don't require access to the ibm-fw-proprietary repository.
 ifeq ($(BR2_PACKAGE_IBM_FW_PROPRIETARY_P10),y)
+ifeq ($(wildcard $(HOSTBOOT_PRECOMPILED_LIBRARIES)/libecc_static.a),)
+    $(info Using ibm-fw-proprietary for ECC implementation)
     HOSTBOOT_P10_DEPENDENCIES += ibm-fw-proprietary-p10
     IBM_FW_PROPRIETARY_P10_BUILD_DIR = $(BUILD_DIR)/ibm-fw-proprietary-p10-$(IBM_FW_PROPRIETARY_P10_VERSION)
+else
+    $(info Using $(HOSTBOOT_PRECOMPILED_LIBRARIES)/libecc_static.a for ECC implementation)
+endif
 endif
 
 # TODO: WORKAROUND: Currently the git clone causes a bad symlink
@@ -44,7 +51,10 @@
                                                  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 ; \
+                                                 cp --no-clobber $(IBM_FW_PROPRIETARY_P10_BUILD_DIR)/vpd/* src/usr/vpd ; \
+                                                 mkdir -p src/build/tools/extern/ibm-fw-proprietary/ ; \
+                                                 cp --no-clobber -r $(IBM_FW_PROPRIETARY_P10_BUILD_DIR)/* src/build/tools/extern/ibm-fw-proprietary/ ; \
+                                                 echo $(IBM_FW_PROPRIETARY_P10_VERSION) >src/build/tools/extern/ibm-fw-proprietary/LIBECC_COMMIT_HASH ; \
                                              fi \
                                           && source ./env.bash && $(MAKE)'
 endef