aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2015-12-01 23:22:51 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-12-01 23:24:07 +0100
commitcc257ee493bbf3261417908684dbff834d853ae6 (patch)
treecca896590d214d7bc90aad71fb8a76465438242b /boot
parent2723fa4a5066b8820b4ff03e2912ccea9ea7c5e0 (diff)
parent01e3d2eff15eb2535c4c15eb4f62467a50fe6a5f (diff)
downloadbuildroot-cc257ee493bbf3261417908684dbff834d853ae6.tar.gz
buildroot-cc257ee493bbf3261417908684dbff834d853ae6.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'boot')
-rw-r--r--boot/barebox/Config.in4
-rw-r--r--boot/barebox/barebox.hash6
2 files changed, 5 insertions, 5 deletions
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 7e8118152b..e9021fbe21 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
Select the specific Barebox version you want to use
config BR2_TARGET_BAREBOX_LATEST_VERSION
- bool "2015.10.0"
+ bool "2015.11.0"
config BR2_TARGET_BAREBOX_CUSTOM_VERSION
bool "Custom version"
@@ -40,7 +40,7 @@ endif
config BR2_TARGET_BAREBOX_VERSION
string
- default "2015.10.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
+ default "2015.11.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash
index 1b927baf9a..bb2ecc2396 100644
--- a/boot/barebox/barebox.hash
+++ b/boot/barebox/barebox.hash
@@ -1,5 +1,5 @@
-# http://www.barebox.org/download/barebox-2015.10.0.tar.bz2.md5
-md5 50b787db3f91bebd5ed646e80a05caab barebox-2015.10.0.tar.bz2
+# http://www.barebox.org/download/barebox-2015.11.0.tar.bz2.md5
+md5 05951fa64000f5baedfc1064dbcfcad0 barebox-2015.11.0.tar.bz2
# Locally calculated
-sha256 8353042fe27a30a01a00fe1e1f4a34f292a291027b9637d3ea8f305387407880 barebox-2015.10.0.tar.bz2
+sha256 ea40cef0a5ef76c4d68e76ac0e5c71c758c563ffa48c08e0b284688ec6f9d422 barebox-2015.11.0.tar.bz2