Skip to content

Commit c64f102

Browse files
joerg-krausetpetazzoni
authored andcommitted
package/uboot-tools: bump to version 2015.07
Also: - update patch #1 - remove patch #3 and #4 -> applied upstream Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
1 parent 7b1e9d5 commit c64f102

5 files changed

Lines changed: 24 additions & 115 deletions
Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,44 @@
1+
From 2e54434e4dd178773e8e11e48afc81299771f3e7 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
3+
Date: Tue, 4 Aug 2015 22:13:20 +0200
4+
Subject: [PATCH 1/1] drop configh from tools
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
19
We need to build u-boot tools without a board configuration for the target.
210
fw_env just uses config.h to define the default environment of the created
311
image, so it really isn't mandatory.
412

513
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
14+
[Jörg Krause: update for version 2015.07]
15+
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
16+
---
17+
tools/env/fw_env.h | 11 -----------
18+
1 file changed, 11 deletions(-)
619

720
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
8-
index aff471b..dfe7439 100644
21+
index 60c0517..1c5daaa 100644
922
--- a/tools/env/fw_env.h
1023
+++ b/tools/env/fw_env.h
11-
@@ -5,14 +5,6 @@
24+
@@ -5,17 +5,6 @@
1225
* SPDX-License-Identifier: GPL-2.0+
1326
*/
1427

1528
-/* Pull in the current config to define the default environment */
29+
-#include <linux/kconfig.h>
30+
-
1631
-#ifndef __ASSEMBLY__
1732
-#define __ASSEMBLY__ /* get only #defines from config.h */
1833
-#include <config.h>
1934
-#undef __ASSEMBLY__
2035
-#else
2136
-#include <config.h>
2237
-#endif
23-
38+
-
2439
/*
2540
* To build the utility with the static configuration
41+
* comment out the next line.
42+
--
43+
2.5.0
44+

package/uboot-tools/0003-Fix-musl-build.patch

Lines changed: 0 additions & 71 deletions
This file was deleted.

package/uboot-tools/0004-tools-use-pkg-config-when-available-to-get-SSL-flags.patch

Lines changed: 0 additions & 39 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Locally computed:
2-
sha256 0a1a70df586655f527befa6f12e184e96ed61b126e5a567382321b17200f5d60 u-boot-2015.04.tar.bz2
2+
sha256 0b48c9bd717f2c322ef791f8282e14c88be942dc7d1226df7e31a812a3af94d9 u-boot-2015.07.tar.bz2

package/uboot-tools/uboot-tools.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
UBOOT_TOOLS_VERSION = 2015.04
7+
UBOOT_TOOLS_VERSION = 2015.07
88
UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
99
UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
1010
UBOOT_TOOLS_LICENSE = GPLv2+

0 commit comments

Comments
 (0)