Minor updates to support a signed VERSION partition
- Point op-build at PNOR commit which supports signed VERSION
- Point op-build at VPNOR commit which supports signed VERSION
- Update PNOR makefile to insert signed VERSION into PNOR image
Signed-off-by: Nick Bofferding <bofferdn@us.ibm.com>
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 8536d22..b96fc9a 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_VERSION ?= 71a2d893fa81b50657327bbefafce05379e1d4fc
+OPENPOWER_PNOR_VERSION ?= 2e68ed6a605d709e09fe268366565a3f10afec31
OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
@@ -149,7 +149,7 @@
-targeting_binary_filename $(BR2_OPENPOWER_TARGETING_ECC_FILENAME) \
-wofdata_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_WOFDATA_BINARY_FILENAME) \
-memddata_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_MEMDDATA_BINARY_FILENAME) \
- -openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE)
+ -openpower_version_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/openpower_pnor_version.bin
$(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME) $(BINARIES_DIR)
diff --git a/openpower/package/openpower-vpnor/openpower-vpnor.mk b/openpower/package/openpower-vpnor/openpower-vpnor.mk
index 6a6cdff..5666617 100644
--- a/openpower/package/openpower-vpnor/openpower-vpnor.mk
+++ b/openpower/package/openpower-vpnor/openpower-vpnor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOST_OPENPOWER_VPNOR_VERSION ?= 643e730e3b9818bdd878eebee209b268c234fc65
+HOST_OPENPOWER_VPNOR_VERSION ?= c39d923fee581533775e37be3f59f77c021718ee
HOST_OPENPOWER_VPNOR_SITE ?= $(call github,openbmc,openpower-pnor-code-mgmt,$(HOST_OPENPOWER_VPNOR_VERSION))
HOST_OPENPOWER_VPNOR_DEPENDENCIES = host-squashfs host-libflash