| Message ID | 1390310776-8840-2-git-send-email-gustavo@zacarias.com.ar |
|---|---|
| State | Accepted |
| Commit | eb9b1f50281b4e0c3363923d461d57a165e8be15 |
| Headers | show |
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes: > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> > --- > boot/uboot/Config.in | 4 ++-- > boot/uboot/uboot.mk | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in > index d693bcf..035e550 100644 > --- a/boot/uboot/Config.in > +++ b/boot/uboot/Config.in > @@ -18,7 +18,7 @@ choice > Select the specific U-Boot version you want to use > config BR2_TARGET_UBOOT_LATEST_VERSION > - bool "2013.10" > + bool "2014.01" > config BR2_TARGET_UBOOT_CUSTOM_VERSION > bool "Custom version" > @@ -63,7 +63,7 @@ endif > config BR2_TARGET_UBOOT_VERSION > string > - default "2013.10" if BR2_TARGET_UBOOT_LATEST_VERSION > + default "2014.01" 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.mk b/boot/uboot/uboot.mk > index ba7087e..2174584 100644 > --- a/boot/uboot/uboot.mk > +++ b/boot/uboot/uboot.mk > @@ -8,7 +8,7 @@ UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION)) > UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) > UBOOT_LICENSE = GPLv2+ > -UBOOT_LICENSE_FILES = COPYING > +UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt Sigh, this is bound to cause problems with people using old/non-mainline versions, but yeah - Not much we can do about it. Committed, thanks.
On 01/21/2014 11:40 AM, Peter Korsgaard wrote: > > +UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt > > Sigh, this is bound to cause problems with people using old/non-mainline > versions, but yeah - Not much we can do about it. > > Committed, thanks. "Calculated tradeoff to avoid issues with the default" :) But yeah, PITA. Regards.
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index d693bcf..035e550 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -18,7 +18,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2013.10" + bool "2014.01" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -63,7 +63,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2013.10" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2014.01" 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.mk b/boot/uboot/uboot.mk index ba7087e..2174584 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -8,7 +8,7 @@ UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION)) UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME)) UBOOT_LICENSE = GPLv2+ -UBOOT_LICENSE_FILES = COPYING +UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt UBOOT_INSTALL_IMAGES = YES
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)