Merge pull request #4513 from mabaiocchi/my_repo_opbuild_ssh/master-p10
Allow "Security Version" To Be Set For A Given Configuration
diff --git a/openpower/configs/p10ebmc_defconfig b/openpower/configs/p10ebmc_defconfig
index fcb58a5..209bd65 100644
--- a/openpower/configs/p10ebmc_defconfig
+++ b/openpower/configs/p10ebmc_defconfig
@@ -90,3 +90,4 @@
BR2_IMA_CATALOG_DTS="POWER10"
BR2_PACKAGE_OCMB_EXPLORER_FW=y
BR2_PACKAGE_IBM_FW_PROPRIETARY_P10=y
+BR2_OPENPOWER_SIGNED_SECURITY_VERSION="0"
diff --git a/openpower/package/openpower-pnor-p10/Config.in b/openpower/package/openpower-pnor-p10/Config.in
index a308149..3e3830e 100644
--- a/openpower/package/openpower-pnor-p10/Config.in
+++ b/openpower/package/openpower-pnor-p10/Config.in
@@ -116,4 +116,9 @@
help
String used to define the name of the OCMBFW update binary file after processing, ecc protected
+config BR2_OPENPOWER_SIGNED_SECURITY_VERSION
+ string "Security Version to be included in signed partitions"
+ help
+ String used to define the security version to be included in signed partition
+
endmenu
diff --git a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
index b76d7b1..6879238 100644
--- a/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
+++ b/openpower/package/openpower-pnor-p10/openpower-pnor-p10.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_P10_VERSION ?= 6d866d38266f683fa1f09df2b40779c6cb02bf0d
+OPENPOWER_PNOR_P10_VERSION ?= dc5cc252ab2c81eb6d0754f95d5212ca3c4269b6
OPENPOWER_PNOR_P10_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_P10_VERSION))
OPENPOWER_PNOR_P10_LICENSE = Apache-2.0
@@ -25,6 +25,10 @@
OPENPOWER_PNOR_P10_SIGN_MODE_ARG = -sign_mode $(BR2_OPENPOWER_P10_SECUREBOOT_SIGN_MODE)
endif
+ifneq ($(BR2_OPENPOWER_SIGNED_SECURITY_VERSION),"")
+SECURITY_VERSION=-security_version $(BR2_OPENPOWER_SIGNED_SECURITY_VERSION)
+endif
+
OPENPOWER_PNOR_P10_INSTALL_IMAGES = YES
OPENPOWER_PNOR_P10_INSTALL_TARGET = NO
@@ -105,7 +109,8 @@
-devtree_binary_filename $(STAGING_DIR)/usr/share/pdata/$(DEVTREE_BINARY_FILENAME) \
-xz_compression \
$(OPENPOWER_PNOR_P10_KEY_TRANSITION_ARG) \
- $(OPENPOWER_PNOR_P10_SIGN_MODE_ARG)
+ $(OPENPOWER_PNOR_P10_SIGN_MODE_ARG) \
+ $(SECURITY_VERSION) \
if [ -n "$(BR2_OPENPOWER_PNOR_P10_LEGACY_PNOR_TARGET)" ] ; then \
echo "***Generating legacy pnor targets..." ;\