diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:22:06 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-12-01 22:29:56 +0100 |
| commit | 8852f08eeda3c9ff4c5f9cc90a169338bda1bff9 (patch) | |
| tree | 8b22aaa4e3c283a73fe2af2eccdfa3926a5430ef /boot | |
| parent | 42dd856ca930f79a831361e337d25fb8dd6e0dd1 (diff) | |
| parent | 4f29cc436b24a8007b065253babe27b9346a479e (diff) | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/uboot/Config.in | 4 | ||||
| -rw-r--r-- | boot/uboot/uboot.hash | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index fabf27db7..3b4bfac07 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -38,7 +38,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2016.09.01" + bool "2016.11" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -86,7 +86,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2016.09.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2016.11" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index db60dabf9..5b2c3bf49 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 95728e89dd476d17428f94080752ab48884be477b6a678941582aeef618b70bb u-boot-2016.09.01.tar.bz2 +sha256 45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8 u-boot-2016.11.tar.bz2 |