Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01
@ 2012-04-27 15:05 Gustavo Zacarias
  2012-04-27 15:05 ` [Buildroot] [PATCH 2/2] u-boot: bump to 2012.04.01 release Gustavo Zacarias
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2012-04-27 15:05 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../uboot-tools-2011.03-drop-configh.patch         |   27 --------------------
 ...tools-2012.04.01-hostcflags-override-fix.patch} |    0
 package/uboot-tools/uboot-tools.mk                 |    2 +-
 3 files changed, 1 insertions(+), 28 deletions(-)
 delete mode 100644 package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
 rename package/uboot-tools/{uboot-tools-2011.03-hostcflags-override-fix.patch => uboot-tools-2012.04.01-hostcflags-override-fix.patch} (100%)

diff --git a/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch b/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
deleted file mode 100644
index bf524c9..0000000
--- a/package/uboot-tools/uboot-tools-2011.03-drop-configh.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-"make tools-all" should allow building tools such as mkimage and the new
-imximage without any config, but imximage.c currently fails to build
-with:
-imximage.h:27:20: error: config.h: No such file or directory
-
-config.h is not needed in imximage.h nor in imximage.c, and imximage.h
-is only included from imximage.c, so drop this include to fix the build.
-
-Signed-off-by: Lo?c Minier <loic.minier@linaro.org>
----
- tools/imximage.h |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/tools/imximage.h b/tools/imximage.h
-index 38ca6be..d126a46 100644
---- a/tools/imximage.h
-+++ b/tools/imximage.h
-@@ -24,8 +24,6 @@
- #ifndef _IMXIMAGE_H_
- #define _IMXIMAGE_H_
- 
--#include <config.h>
--
- #define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */
- #define MAX_HW_CFG_SIZE_V1 60  /* Max number of registers imx can set for v1 */
- #define APP_CODE_BARKER	0xB1
--- 1.7.2.3
diff --git a/package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch b/package/uboot-tools/uboot-tools-2012.04.01-hostcflags-override-fix.patch
similarity index 100%
rename from package/uboot-tools/uboot-tools-2011.03-hostcflags-override-fix.patch
rename to package/uboot-tools/uboot-tools-2012.04.01-hostcflags-override-fix.patch
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index 00592d6..d757ade 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -1,4 +1,4 @@
-UBOOT_TOOLS_VERSION = 2011.03
+UBOOT_TOOLS_VERSION = 2012.04.01
 UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
 
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] u-boot: bump to 2012.04.01 release
  2012-04-27 15:05 [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01 Gustavo Zacarias
@ 2012-04-27 15:05 ` Gustavo Zacarias
  2012-04-29  9:03   ` Peter Korsgaard
  2012-04-29  9:00 ` [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01 Peter Korsgaard
  2012-04-30  8:44 ` Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Gustavo Zacarias @ 2012-04-27 15:05 UTC (permalink / raw)
  To: buildroot

Bump from 2012.04 to 2012.04.01
Fixes a nasty bug in the command line processing.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 boot/uboot/Config.in                               |    8 ++++----
 ...012.04-change-kernel-address-in-dataflash.patch |    0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename boot/uboot/{uboot-2012.04 => uboot-2012.04.01}/uboot-2012.04-change-kernel-address-in-dataflash.patch (100%)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 7c5f2c6..0d6a2b2 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -12,12 +12,12 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 choice
 	prompt "U-Boot Version"
-	default BR2_TARGET_UBOOT_2012_04
+	default BR2_TARGET_UBOOT_2012_04_01
 	help
 	  Select the specific U-Boot version you want to use
 
-config BR2_TARGET_UBOOT_2012_04
-	bool "2012.04"
+config BR2_TARGET_UBOOT_2012_04_01
+	bool "2012.04.01"
 
 config BR2_TARGET_UBOOT_2011_12
 	bool "2011.12"
@@ -50,7 +50,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2012.04"	if BR2_TARGET_UBOOT_2012_04
+	default "2012.04.01"	if BR2_TARGET_UBOOT_2012_04_01
 	default "2011.12"	if BR2_TARGET_UBOOT_2011_12
 	default "2011.09"	if BR2_TARGET_UBOOT_2011_09
 	default "2011.06"	if BR2_TARGET_UBOOT_2011_06
diff --git a/boot/uboot/uboot-2012.04/uboot-2012.04-change-kernel-address-in-dataflash.patch b/boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
similarity index 100%
rename from boot/uboot/uboot-2012.04/uboot-2012.04-change-kernel-address-in-dataflash.patch
rename to boot/uboot/uboot-2012.04.01/uboot-2012.04-change-kernel-address-in-dataflash.patch
-- 
1.7.3.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01
  2012-04-27 15:05 [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01 Gustavo Zacarias
  2012-04-27 15:05 ` [Buildroot] [PATCH 2/2] u-boot: bump to 2012.04.01 release Gustavo Zacarias
@ 2012-04-29  9:00 ` Peter Korsgaard
  2012-04-30  8:44 ` Peter Korsgaard
  2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2012-04-29  9:00 UTC (permalink / raw)
  To: buildroot

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] u-boot: bump to 2012.04.01 release
  2012-04-27 15:05 ` [Buildroot] [PATCH 2/2] u-boot: bump to 2012.04.01 release Gustavo Zacarias
@ 2012-04-29  9:03   ` Peter Korsgaard
  0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2012-04-29  9:03 UTC (permalink / raw)
  To: buildroot

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Bump from 2012.04 to 2012.04.01
 Gustavo> Fixes a nasty bug in the command line processing.

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Gustavo> ---
 Gustavo>  boot/uboot/Config.in                               |    8 ++++----
 Gustavo>  ...012.04-change-kernel-address-in-dataflash.patch |    0
 Gustavo>  2 files changed, 4 insertions(+), 4 deletions(-)
 Gustavo>  rename boot/uboot/{uboot-2012.04 => uboot-2012.04.01}/uboot-2012.04-change-kernel-address-in-dataflash.patch (100%)

 Gustavo> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
 Gustavo> index 7c5f2c6..0d6a2b2 100644
 Gustavo> --- a/boot/uboot/Config.in
 Gustavo> +++ b/boot/uboot/Config.in
 Gustavo> @@ -12,12 +12,12 @@ config BR2_TARGET_UBOOT_BOARDNAME
 
 Gustavo>  choice
 Gustavo>  	prompt "U-Boot Version"
 Gustavo> -	default BR2_TARGET_UBOOT_2012_04
 Gustavo> +	default BR2_TARGET_UBOOT_2012_04_01

I prefer to keep the Kconfig option the same and just update the bool ""
description, similar to how we do it for the kernel/busybox.

Committed with that change.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01
  2012-04-27 15:05 [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01 Gustavo Zacarias
  2012-04-27 15:05 ` [Buildroot] [PATCH 2/2] u-boot: bump to 2012.04.01 release Gustavo Zacarias
  2012-04-29  9:00 ` [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01 Peter Korsgaard
@ 2012-04-30  8:44 ` Peter Korsgaard
  2012-04-30 12:12   ` Gustavo Zacarias
  2 siblings, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2012-04-30  8:44 UTC (permalink / raw)
  To: buildroot

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Gustavo> ---
 Gustavo>  .../uboot-tools-2011.03-drop-configh.patch         |   27 --------------------

Are you sure this isn't needed anymore? It seems to still include
config.h:

http://autobuild.buildroot.org/results/5eb75098b4820727d6eba56f589710df9f892e5e/build-end.log

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01
  2012-04-30  8:44 ` Peter Korsgaard
@ 2012-04-30 12:12   ` Gustavo Zacarias
  0 siblings, 0 replies; 6+ messages in thread
From: Gustavo Zacarias @ 2012-04-30 12:12 UTC (permalink / raw)
  To: buildroot

On 2012-04-30 05:44, Peter Korsgaard wrote:

> Are you sure this isn't needed anymore? It seems to still include
> config.h:
>
> 
> http://autobuild.buildroot.org/results/5eb75098b4820727d6eba56f589710df9f892e5e/build-end.log

Actually a completely different patch is needed altogether, just sent a 
patch to fix it.
Regards.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2012-04-30 12:12 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-27 15:05 [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01 Gustavo Zacarias
2012-04-27 15:05 ` [Buildroot] [PATCH 2/2] u-boot: bump to 2012.04.01 release Gustavo Zacarias
2012-04-29  9:03   ` Peter Korsgaard
2012-04-29  9:00 ` [Buildroot] [PATCH 1/2] uboot-tools: bump to version 2012.04.01 Peter Korsgaard
2012-04-30  8:44 ` Peter Korsgaard
2012-04-30 12:12   ` Gustavo Zacarias

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox