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>
diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index c360f13..a3cedf5 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -1,4 +1,5 @@
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-ffs/Config.in"
+source "$BR2_EXTERNAL_OP_BUILD_PATH/package/ibm-fw-proprietary-p10/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot-p10/Config.in"
source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot-binaries/Config.in"
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
diff --git a/openpower/package/ibm-fw-proprietary-p10/Config.in b/openpower/package/ibm-fw-proprietary-p10/Config.in
new file mode 100644
index 0000000..07d09a0
--- /dev/null
+++ b/openpower/package/ibm-fw-proprietary-p10/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_IBM_FW_PROPRIETARY_P10
+ bool "ibm-fw-proprietary-p10"
+ default n
+ help
+ Project to bring in IBM's proprietary code/files.
+
diff --git a/openpower/package/ibm-fw-proprietary-p10/ibm-fw-proprietary-p10.mk b/openpower/package/ibm-fw-proprietary-p10/ibm-fw-proprietary-p10.mk
new file mode 100644
index 0000000..290c6fa
--- /dev/null
+++ b/openpower/package/ibm-fw-proprietary-p10/ibm-fw-proprietary-p10.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# VPD ECC data Algorithms
+#
+################################################################################
+
+IBM_FW_PROPRIETARY_P10_VERSION = 043e661d1e95f62e1e4ff8bdd216e2f1443019af
+IBM_FW_PROPRIETARY_P10_SITE = git@github.ibm.com:open-power/ibm-fw-proprietary.git
+IBM_FW_PROPRIETARY_P10_SITE_METHOD = git
+
+IBM_FW_PROPRIETARY_P10_LICENSE = IBM Confidential
+
+$(eval $(generic-package))