op-build OP920 hostboot-binaries,hcode,hostboot,sbe bumps
OCC is still common between stable OP920 and master.
We introduce config options for hostboot-binaries and SBE though.
Changes Included for package hostboot-binaries, branch release-op920:
49ecf52 - hostboot - 2018-04-26 - UPDATE executables for the NVIDIA gpu and/or ring files for hw042618a.op920
Changes Included for package hcode, branch release-op920:
a3a060c - hostboot - 2018-04-26 - Release tag information updated for hw042618a.op920
e2422fd - Rahul Batra - 2018-04-26 - PM: Fixes for Livelock Scenarios
63b7622 - Rahul Batra - 2018-04-26 - PM: Fixes for Livelock Scenarios
0ebb671 - Yue Du - 2018-04-26 - STOP: Fix SGPE Active Core Updates
Changes Included for package hostboot, branch release-op920:
c78530b - Christian Geddes - 2018-04-25 - Change sbe restart fail hwCallouts from GARDs to DECONFIG
fbda730 - Soma BhanuTej - 2018-04-25 - BugFix in progm exception & update brief info
0e7f35f - Christian Geddes - 2018-04-25 - Improve linking of PLIDs for sbe_retry_handler
c933337 - Christian Geddes - 2018-04-25 - Change all FAPI_INVOKE calls to be FAPI_EXEC in sbe_retry_handler
a05bb0e - Nick Klazynski - 2018-04-25 - TM workaround for HW443982
6527cd1 - Ben Gass - 2018-04-25 - Adding p9n 2.3 support and p9n 2.3/p9c 1.2 security update
ae5e20e - Chris Cain - 2018-04-24 - HTMGT: Support AVSBus Config packet for Vdd Current roll over workaround
Changes Included for package sbe, branch release-op920:
26a37e4 - Rahul Batra - 2018-04-26 - PM: Fixes for Livelock Scenarios
c4c918c - Nick Klazynski - 2018-04-24 - TM workaround for HW443982
85afccc - Ben Gass - 2018-04-24 - Adding p9n 2.3 support and p9n 2.3/p9c 1.2 security update
be9f291 - Christian Geddes - 2018-04-24 - PM: Clean up PM Reset and PM Complex Suspend
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index e1c810f..8dd7451 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -35,7 +35,7 @@
config BR2_HCODE_VERSION
string
default "1b068da5e7532c03b43daea4dc268e7de9cd650d" if BR2_HCODE_LATEST_VERSION
- default "a4ea84060888d68d179c48ace6d0b0cea20e8988" if BR2_HCODE_OP920_VERSION
+ default "a3a060cd02c7ecab9abc660afc7f403d6aa54f7e" if BR2_HCODE_OP920_VERSION
default BR2_HCODE_CUSTOM_VERSION_VALUE \
if BR2_HCODE_CUSTOM_VERSION
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index 4c3e770..74d0a8f 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -3,3 +3,33 @@
default y if (BR2_OPENPOWER_PLATFORM)
help
Project to stage hostboot binary images
+
+if BR2_PACKAGE_HOSTBOOT_BINARIES
+
+choice
+ prompt "Hostboot-binaries version"
+ default BR2_HOSTBOOT_BINARIES_OP920_VERSION
+
+config BR2_HOSTBOOT_BINARIES_OP920_VERSION
+ bool "Use latest HOSTBOOT_BINARIES stable version (OP920)"
+
+config BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ bool "Use latest HOSTBOOT_BINARIES master"
+
+config BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
+ bool "Custom HOSTBOOT_BINARIES version"
+
+endchoice
+
+config BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE
+ string "HOSTBOOT_BINARIES version"
+ depends on BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
+
+config BR2_HOSTBOOT_BINARIES_VERSION
+ string
+ default "148fbe195c171dc05a823ea05e82d1bd01bdabaa" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+ default "49ecf5277a53fd8be2bb8b89eef6f1b0000ca742" if BR2_HOSTBOOT_BINARIES_OP920_VERSION
+ default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
+ if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
+
+endif
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 3fa1ecd..aefe480 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -5,7 +5,7 @@
################################################################################
-HOSTBOOT_BINARIES_VERSION ?= 148fbe195c171dc05a823ea05e82d1bd01bdabaa
+HOSTBOOT_BINARIES_VERSION = $(call qstrip,$(BR2_HOSTBOOT_BINARIES_VERSION))
HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
HOSTBOOT_BINARIES_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 69a3510..d7a11eb 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -29,7 +29,7 @@
config BR2_HOSTBOOT_VERSION
string
default "c38615a583b7f19c0ae6a5a152b575fe61ff3d2a" if BR2_HOSTBOOT_LATEST_VERSION
- default "4b25a2be9395e4d287c94a1900ae54823efd477c" if BR2_HOSTBOOT_OP920_VERSION
+ default "c78530bd29942282e2345295af1f157f0a8eefd7" if BR2_HOSTBOOT_OP920_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION
diff --git a/openpower/package/sbe/Config.in b/openpower/package/sbe/Config.in
index c512bbb..67a5135 100644
--- a/openpower/package/sbe/Config.in
+++ b/openpower/package/sbe/Config.in
@@ -5,3 +5,33 @@
depends on BR2_PACKAGE_HCODE
help
Project to build the sbe firmware codebase
+
+if BR2_PACKAGE_SBE
+
+choice
+ prompt "SBE version"
+ default BR2_SBE_OP920_VERSION
+
+config BR2_SBE_OP920_VERSION
+ bool "Use latest SBE stable version (OP920)"
+
+config BR2_SBE_LATEST_VERSION
+ bool "Use latest SBE master"
+
+config BR2_SBE_CUSTOM_VERSION
+ bool "Custom SBE version"
+
+endchoice
+
+config BR2_SBE_CUSTOM_VERSION_VALUE
+ string "SBE version"
+ depends on BR2_SBE_CUSTOM_VERSION
+
+config BR2_SBE_VERSION
+ string
+ default "a389a5d98c2ab38292ce7451c210b3cb0293938c" if BR2_SBE_LATEST_VERSION
+ default "26a37e4d6c82743232c9e06767a223fcaf4f5555" if BR2_SBE_OP920_VERSION
+ default BR2_SBE_CUSTOM_VERSION_VALUE \
+ if BR2_SBE_CUSTOM_VERSION
+
+endif
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 7509881..0cc1942 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,8 +4,8 @@
#
################################################################################
-SBE_VERSION ?= a389a5d98c2ab38292ce7451c210b3cb0293938c
-SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
+SBE_VERSION = $(call qstrip,$(BR2_SBE_VERSION))
+SBE_SITE = $(call github,open-power,sbe,$(SBE_VERSION))
SBE_LICENSE = Apache-2.0
SBE_DEPENDENCIES = host-ppe42-gcc hcode