Merge pull request #1217 from drajarshi/ima-update
ima-catalog: update version: Added MBA nodes to P9 DTS files
diff --git a/openpower/configs/redbud_defconfig b/openpower/configs/witherspoon-redbud_defconfig
similarity index 95%
rename from openpower/configs/redbud_defconfig
rename to openpower/configs/witherspoon-redbud_defconfig
index f9e6b7a..7a26177 100644
--- a/openpower/configs/redbud_defconfig
+++ b/openpower/configs/witherspoon-redbud_defconfig
@@ -42,14 +42,14 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="5b59a1dc4cf70c395ac984a800aef9822d8881ea"
+BR2_OPENPOWER_MACHINE_XML_VERSION="896d1e14fce4a5b54b0052236c8220a64115cfc7"
BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
BR2_OPENPOWER_CONFIG_NAME="witherspoon"
-BR2_OPENPOWER_PNOR_FILENAME="redbud.pnor"
+BR2_OPENPOWER_PNOR_FILENAME="witherspoon-redbud.pnor"
BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon-sequoia_defconfig
similarity index 97%
rename from openpower/configs/witherspoon_defconfig
rename to openpower/configs/witherspoon-sequoia_defconfig
index d41c2f0..d7580fb 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon-sequoia_defconfig
@@ -48,7 +48,7 @@
BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
BR2_OPENPOWER_CONFIG_NAME="witherspoon"
-BR2_OPENPOWER_PNOR_FILENAME="witherspoon.pnor"
+BR2_OPENPOWER_PNOR_FILENAME="witherspoon-sequoia.pnor"
BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 667ea10..1fb0894 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= 858e352de10cdfb498b9052cc92bb2316d2daf5c
+HOSTBOOT_BINARIES_VERSION ?= 6a7251e12657cdec51f1377533ad3cb0800e88d9
HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
HOSTBOOT_BINARIES_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 2bbf2ed..0a83848 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 695bd891343faf1f0ef85fe53148590e58239efd
-HOSTBOOT_VERSION_BRANCH_MASTER ?= b323a918ff0bfea7f98102b3aff2dda9a5467d34
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 3fa8be9691257382bddaab035609cbe95afdb05c
HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/petitboot/petitboot.mk b/openpower/package/petitboot/petitboot.mk
index af535d4..99444c9 100644
--- a/openpower/package/petitboot/petitboot.mk
+++ b/openpower/package/petitboot/petitboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PETITBOOT_VERSION = v1.4.3
+PETITBOOT_VERSION = v1.5.0
PETITBOOT_SITE ?= $(call github,open-power,petitboot,$(PETITBOOT_VERSION))
PETITBOOT_DEPENDENCIES = ncurses udev host-bison host-flex lvm2
PETITBOOT_LICENSE = GPLv2
diff --git a/openpower/package/sbe/sbe-0001-Restore-backward-compatibilty-of-SBE-image-with-HB-H.patch b/openpower/package/sbe/sbe-0001-Restore-backward-compatibilty-of-SBE-image-with-HB-H.patch
new file mode 100644
index 0000000..da51587
--- /dev/null
+++ b/openpower/package/sbe/sbe-0001-Restore-backward-compatibilty-of-SBE-image-with-HB-H.patch
@@ -0,0 +1,55 @@
+From bee7283419489e911b3e2f44ca96bf1ac12264e5 Mon Sep 17 00:00:00 2001
+From: Sachin Gupta <sgupta2m@in.ibm.com>
+Date: Thu, 6 Jul 2017 12:33:32 -0500
+Subject: [PATCH] Restore backward compatibilty of SBE image with HB/HWSV
+
+Change-Id: I2eba38a5d5a254c9595ee49e56f65b6c7ded67a6
+Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42819
+Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
+Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
+Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
+Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
+Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42822
+Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
+---
+ .../p9/procedures/hwp/perv/p9_sbe_attr_setup.C | 24 ++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
+index 03f1530..bf7b129 100644
+--- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
++++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_attr_setup.C
+@@ -233,6 +233,30 @@ fapi2::ReturnCode p9_sbe_attr_setup(const
+ l_read_scratch_reg.extractToRight<ATTR_OB2_PLL_BUCKET_STARTBIT, ATTR_OB2_PLL_BUCKET_LENGTH>(l_ob2_pll_bucket);
+ l_read_scratch_reg.extractToRight<ATTR_OB3_PLL_BUCKET_STARTBIT, ATTR_OB3_PLL_BUCKET_LENGTH>(l_ob3_pll_bucket);
+
++ // Workaround to handle backward compatibilty
++ // Old drivers will keep MBX OBUS PLL bucket value as zero. So
++ // change it to 1 to make old drivers compatible with new SBE
++ // image
++ if( 0 == l_ob0_pll_bucket )
++ {
++ l_ob0_pll_bucket = 1;
++ }
++
++ if( 0 == l_ob1_pll_bucket )
++ {
++ l_ob1_pll_bucket = 1;
++ }
++
++ if( 0 == l_ob2_pll_bucket )
++ {
++ l_ob2_pll_bucket = 1;
++ }
++
++ if( 0 == l_ob3_pll_bucket )
++ {
++ l_ob3_pll_bucket = 1;
++ }
++
+ FAPI_DBG("Setting up ATTR_I2C_BUS_DIV_REF");
+ FAPI_TRY(FAPI_ATTR_SET(fapi2::ATTR_I2C_BUS_DIV_REF, i_target_chip, l_read_4));
+
+--
+1.8.2.2
+
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index ddff494..e357370 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v5.7-rc1" if BR2_SKIBOOT_LATEST_VERSION
+ default "v5.7-rc2" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION