Merge pull request #2910 from shenki/buildroot-2019.05
buildroot: Move to 2019.05
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index 592916b..12231ab 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_VERSION
string
- default "hw060819a.940" if BR2_HCODE_LATEST_VERSION
+ default "hw061519a.940" if BR2_HCODE_LATEST_VERSION
default BR2_HCODE_CUSTOM_VERSION_VALUE \
if BR2_HCODE_CUSTOM_VERSION
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 37de882..d34946d 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "a697687b5e5e15b00b841db5f2c8c66ee9d8ef35" if BR2_HOSTBOOT_LATEST_VERSION
+ default "aa4a14d415c7418ec6e234e5b2dacf0f31040022" if BR2_HOSTBOOT_LATEST_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 2fe0b9d..0f9a10d 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -154,6 +154,18 @@
help
String used to define name of openpower targeting binary file, ecc protected
+config BR2_OCMBFW_FILENAME
+ string "Name of the OCMBFW Update original file"
+ default "ocmbfw.bin"
+ help
+ String used to define name of OCBMFW Update original file (before any processing occurs)
+
+config BR2_OCMBFW_PROCESSED_FILENAME
+ string "Name of OCMBFW Update binary processed file"
+ default "ocmbfw.bin.ecc"
+ help
+ String used to define the name of the OCMBFW update binary file after processing, ecc protected
+
config BR2_OPENPOWER_PNOR_XZ_ENABLED
bool "Enable xz compression in PNOR payloads"
default n
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 808a989..917231e 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENPOWER_PNOR_VERSION ?= bc08dd1ec4a746545be488e60cbc2d11dc06a35b
+OPENPOWER_PNOR_VERSION ?= 43fc2ebbae0f6082520f70b021f958661ee5c994
OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
OPENPOWER_PNOR_LICENSE = Apache-2.0
@@ -129,6 +129,8 @@
-payload_filename $(BR2_SKIBOOT_LID_XZ_NAME) \
-binary_dir $(BINARIES_DIR) \
-bootkernel_filename $(LINUX_IMAGE_NAME) \
+ -ocmbfw_original_filename $(OPENPOWER_PNOR_SCRATCH_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) \
$(XZ_ARG) $(KEY_TRANSITION_ARG) $(SIGN_MODE_ARG) \
@@ -151,6 +153,7 @@
-targeting_RW_binary_filename $(BR2_OPENPOWER_TARGETING_ECC_FILENAME).unprotected \
-wofdata_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_WOFDATA_BINARY_FILENAME) \
-memddata_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_MEMDDATA_BINARY_FILENAME) \
+ -ocmbfw_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_PROCESSED_FILENAME) \
-openpower_version_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/openpower_pnor_version.bin
$(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME) $(BINARIES_DIR)