op-build update 2-24-2020
Changes Included for package sbe, branch master-p10:
1051866 - Raja Das - 2020-02-24 - Added default pibmem repair sequence given by SOA Team
db847de - Raja Das - 2020-02-24 - Toggle TPM HReset in measurement flow
7a2a052 - Prasad Bg Ranganath - 2020-02-21 - SBE putring suport
ba9e4f8 - Murulidhar Nataraju - 2020-02-21 - Update p10_sbe_attributes.xml with missing attribute
5b8f988 - Thi Tran - 2020-02-21 - Adding fastarray override ring ids bin to SBE image
f9c343e - Jenny Huynh - 2020-02-21 - Remove p10_nmmu_scom.H from p10_sbe_scominit
3458442 - Gregory S Still - 2020-02-21 - Revert "PM: p10_ipl_customize enablement of HV_INITS dyn init at runtime"
8a11468 - Sunil Kumar - 2020-02-20 - sbe Tools for simics.
21f3392 - RAJA DAS - 2020-02-20 - Revert "SBE putring chipop support"
2011f32 - Greg Still - 2020-02-20 - PM: p10_ipl_customize enablement of HV_INITS dyn init at runtime
47d6298 - Jenny Huynh - 2020-02-20 - Epsilons update for hostboot/chip-contained
7aabd51 - Olsen - 2020-02-20 - TOR API : Refactoring, traversal and buffer check improvements
Also remove SBE simulation distribution patches
Changes Included for package pnor, branch master-p10:
f65af64 - William G Hoffa - 2020-02-20 - Merge pull request #5 from dsanner/sbe.simics
9306a59 - Dean Sanner - 2020-02-17 - Add SBE Simics images to PNOR creation steps
Signed-off-by: Bill Hoffa <wghoffa@us.ibm.com>
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 1e5a095..4053dd4 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_VERSION ?= 544815b3f51c2882214b3cb9708e193626d1f524
+OPENPOWER_PNOR_VERSION ?= f65af64e9a554aa877f45a5adeec419145beda12
# TODO: WORKAROUND: Need to reenable next line and comment out the two lines
# after that, when code is propagated to a public repo
@@ -16,6 +16,8 @@
OPENPOWER_PNOR_LICENSE_FILES = LICENSE
OPENPOWER_PNOR_DEPENDENCIES = hostboot-binaries machine-xml skiboot host-openpower-ffs capp-ucode host-openpower-pnor-util
+SBE_P10_VERSION = $(call qstrip,$(BR2_SBE_P10_VERSION))
+
ifeq ($(BR2_OPENPOWER_POWER9),y)
OPENPOWER_PNOR_DEPENDENCIES += hcode
endif
@@ -75,6 +77,7 @@
OUTPUT_IMAGES_DIR = $(STAGING_DIR)/../../../images/
HOSTBOOT_BUILD_IMAGES_DIR = $(STAGING_DIR)/hostboot_build_images/
FSP_TRACE_IMAGES_DIR = $(STAGING_DIR)/fsp-trace/
+SBE_IMAGE_DIR = $(STAGING_DIR)/../../../build/sbe-p10-"$(SBE_P10_VERSION)"/images
FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
$(OUTPUT_BUILD_DIR)/skiboot-$(BR2_SKIBOOT_VERSION)/skiboot.elf \
@@ -149,6 +152,7 @@
-ocmbfw_original_filename $(BINARIES_DIR)/$(BR2_OCMBFW_FILENAME) \
-ocmbfw_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_PROCESSED_FILENAME) \
-pnor_layout $(@D)/"$(OPENPOWER_RELEASE)"Layouts/$(BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME) \
+ -sbe_img_dir $(SBE_IMAGE_DIR) \
$(XZ_ARG) $(KEY_TRANSITION_ARG) $(SIGN_MODE_ARG) \
mkdir -p $(STAGING_DIR)/pnor/