uboot-tools: re-generate patches to match v2016.05

They were differences against Das U-Boot versions 2015.07 and 2015.04.
Generating again helps to apply them with "git am".

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/uboot-tools/0001-drop-configh-from-tools.patch b/package/uboot-tools/0001-drop-configh-from-tools.patch
index e77a301760672b875da4b323d49e956328bb0e1c..fbc96084db6ed4a1d424deaed55fce281822806f 100644 (file)
--- a/package/uboot-tools/0001-drop-configh-from-tools.patch
+++ b/package/uboot-tools/0001-drop-configh-from-tools.patch
@@ -1,7 +1,7 @@
-From 2e54434e4dd178773e8e11e48afc81299771f3e7 Mon Sep 17 00:00:00 2001
+From b742c7590ac6d9ac72dd227679ccff79433b3512 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
 Date: Tue, 4 Aug 2015 22:13:20 +0200
-Subject: [PATCH 1/1] drop configh from tools
+Subject: [PATCH] drop configh from tools
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -18,12 +18,12 @@ Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
  1 file changed, 11 deletions(-)
 
 diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
-index 60c0517..1c5daaa 100644
+index 57149e7..50049fe 100644
 --- a/tools/env/fw_env.h
 +++ b/tools/env/fw_env.h
-@@ -5,17 +5,6 @@
-  * SPDX-License-Identifier:   GPL-2.0+
-  */
+@@ -8,17 +8,6 @@
+ #include <aes.h>
+ #include <stdint.h>
  
 -/* Pull in the current config to define the default environment */
 -#include <linux/kconfig.h>
@@ -40,5 +40,5 @@ index 60c0517..1c5daaa 100644
   * To build the utility with the static configuration
   * comment out the next line.
 -- 
-2.5.0
+2.7.4
 

diff --git a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch
index fedf9beeb63e0cb905398c652f586a27b83d0a10..795466f49efef622d69feccd1dc4d205a9c48b7b 100644 (file)
--- a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch
+++ b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch
@@ -1,7 +1,7 @@
-From 7d9bac7bf8d9ef39ab6b6e8d436e3dbdee5cd120 Mon Sep 17 00:00:00 2001
+From b8110293d70c4f43035dfd6a0904d342be6a08e0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
 Date: Sun, 1 Feb 2015 21:53:47 +0100
-Subject: [PATCH 1/1] tools only in no dot config targets
+Subject: [PATCH] tools only in no dot config targets
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -23,17 +23,18 @@ Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 36a9a28..f85c194 100644
+index 954a865..3ab5958 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -417,7 +417,7 @@ timestamp_h := include/generated/timestamp_autogenerated.h
-
+@@ -424,7 +424,7 @@ timestamp_h := include/generated/timestamp_autogenerated.h
+ 
  no-dot-config-targets := clean clobber mrproper distclean \
-                        help %docs check% coccicheck \
+                        help %docs check% coccicheck \
 -                       ubootversion backup
 +                       ubootversion backup tools-only
-
+ 
  config-targets := 0
  mixed-targets  := 0
---
-2.3.0
+-- 
+2.7.4
+