Merge pull request #2880 from shenki/kernel-5.1.2
kernel: Release Linux v5.1.2-openpower1
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index a9d327c..563cc0c 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -45,7 +45,7 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="romulus.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="romulus-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="741046046ec3a6fea28c3829b451801b16f22fd0"
+BR2_OPENPOWER_MACHINE_XML_VERSION="be9d6cfc4f9b1c64d501bf136a0cff295ec3565b"
BR2_OPENPOWER_MACHINE_XML_FILENAME="romulus.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="ROMULUS_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="ROMULUS_hb.mrw.xml"
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index 6e993d0..e0f5b17 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -31,7 +31,7 @@
config BR2_HCODE_VERSION
string
- default "hw051119a.940" if BR2_HCODE_LATEST_VERSION
+ default "hw051519a.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 cf50180..8d2d393 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
config BR2_HOSTBOOT_VERSION
string
- default "9cd799d038d2e733680747afff3ad08d29810949" if BR2_HOSTBOOT_LATEST_VERSION
+ default "64f4f47ac448e645dcdf4eb94d327481cc42a8fb" if BR2_HOSTBOOT_LATEST_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 987a9c0..121e2c4 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -22,7 +22,7 @@
define SBE_INSTALL_IMAGES_CMDS
$(INSTALL) -D $(@D)/images/p9_ipl_build $(HOST_DIR)/usr/bin/
- python $(@D)/src/build/sbeOpDistribute.py --sbe_binary_dir=$(STAGING_DIR)/sbe_binaries --img_dir=$(@D)/images
+ python $(@D)/src/build/sbeOpDistribute.py --sbe_binary_dir=$(STAGING_DIR)/sbe_binaries --img_dir=$(@D)/images --sbe_binary_filename $(BR2_HOSTBOOT_BINARY_SBE_FILENAME)
cp $(@D)/src/build/sbeOpDistribute.py $(STAGING_DIR)/sbe_binaries/
endef