summaryrefslogtreecommitdiffstats
path: root/openpower
diff options
context:
space:
mode:
authorWilliam Hoffa <wihoffa@gmail.com>2019-03-07 15:50:55 -0600
committerGitHub <noreply@github.com>2019-03-07 15:50:55 -0600
commit7641d96b0e0d08d0fa17287f5705d50014e96738 (patch)
tree3849002c2e3a3e2bc2ea861af0666ec296a766ce /openpower
parent1429ed45afb9c62fb7dad7303fa136225871834f (diff)
parent382af98a18447980c02b4ab00acb5fab2b7cf4af (diff)
downloadblackbird-op-build-7641d96b0e0d08d0fa17287f5705d50014e96738.tar.gz
blackbird-op-build-7641d96b0e0d08d0fa17287f5705d50014e96738.zip
Merge pull request #2682 from wghoffa/no-hb-stable-just-latest
hostboot: just build latest hostboot
Diffstat (limited to 'openpower')
-rw-r--r--openpower/configs/witherspoon_dev_defconfig1
-rw-r--r--openpower/package/hostboot/Config.in6
2 files changed, 1 insertions, 6 deletions
diff --git a/openpower/configs/witherspoon_dev_defconfig b/openpower/configs/witherspoon_dev_defconfig
index 0d7b51dd..ee8d7202 100644
--- a/openpower/configs/witherspoon_dev_defconfig
+++ b/openpower/configs/witherspoon_dev_defconfig
@@ -44,7 +44,6 @@ BR2_TARGET_ROOTFS_CPIO_XZ=y
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 2aadf0a5..b948b229 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -9,14 +9,11 @@ if BR2_PACKAGE_HOSTBOOT
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_CUSTOM_VERSION_VALUE
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
OpenPOWER on IntegriCloud