Merge tag 'v2.2'
op-build v2.2
diff --git a/openpower/configs/witherspoon_dev_defconfig b/openpower/configs/witherspoon_dev_defconfig
index 0d7b51d..ee8d720 100644
--- a/openpower/configs/witherspoon_dev_defconfig
+++ b/openpower/configs/witherspoon_dev_defconfig
@@ -44,7 +44,6 @@
BR2_TARGET_ROOTFS_INITRAMFS=y
BR2_OPENPOWER_PLATFORM=y
BR2_OPENPOWER_POWER9=y
-BR2_HOSTBOOT_LATEST_VERSION=y
BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
BR2_OPENPOWER_MACHINE_XML_VERSION="7cd20a6ac8fe3b693ccf50a5ab86ce55ca994fdc"
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 2aadf0a..b948b22 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -9,14 +9,11 @@
choice
prompt "Hostboot version"
- default BR2_HOSTBOOT_STABLE_VERSION
+ default BR2_HOSTBOOT_LATEST_VERSION
config BR2_HOSTBOOT_LATEST_VERSION
bool "Use latest Hostboot master"
-config BR2_HOSTBOOT_STABLE_VERSION
- bool "Use stable Hostboot version"
-
config BR2_HOSTBOOT_CUSTOM_VERSION
bool "Custom version"
@@ -29,7 +26,6 @@
config BR2_HOSTBOOT_VERSION
string
default "37e67698be56632c6505990dc3375136494d2a67" if BR2_HOSTBOOT_LATEST_VERSION
- default "37e67698be56632c6505990dc3375136494d2a67" if BR2_HOSTBOOT_STABLE_VERSION
default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
if BR2_HOSTBOOT_CUSTOM_VERSION