diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-09-02 16:20:33 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-09-02 16:20:33 +0200 |
| commit | 7353967690b425fd6519756979f3ef839b1a9cd1 (patch) | |
| tree | a910fd6b794556251fe607295c631aed98534235 /boot | |
| parent | cff53ce35b8dab3bbdd9aa4471d1ecb3238c9fab (diff) | |
| parent | 1bd02bc230e1b3b22ca3eb23fb3dcb91b878283a (diff) | |
Merge branch 'next'
Quite some conflicts, so here goes ..
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/barebox/Config.in | 4 | ||||
| -rw-r--r-- | boot/barebox/barebox.hash | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index fd5cb8ccb..1548b0d2c 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 "2016.06.0" + bool "2016.08.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2016.06.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2016.08.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 9db68eb2e..adcd4e0b9 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,5 +1,5 @@ -# http://www.barebox.org/download/barebox-2016.06.0.tar.bz2.md5 -md5 7dac834e637db66e624bf058e9310212 barebox-2016.06.0.tar.bz2 +# http://www.barebox.org/download/barebox-2016.08.0.tar.bz2.md5 +md5 66b8f79d337fa4a7bb8744b1a7867474 barebox-2016.08.0.tar.bz2 # Locally calculated -sha256 a214167c55bf691f686397379e8b9557a1d597e56b7c1bf9607b478a1c4c597e barebox-2016.06.0.tar.bz2 +sha256 610d3422137f0e6e9a72f51caad17d1b2c46314ee03b2ae35799a1c5425478ab barebox-2016.08.0.tar.bz2 |