Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -1,4 +1,4 @@
|
||||
From b742c7590ac6d9ac72dd227679ccff79433b3512 Mon Sep 17 00:00:00 2001
|
||||
From 216832de3bc3e6ef093305c6d07f464f7606f2d6 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] drop configh from tools
|
||||
@@ -13,17 +13,20 @@ image, so it really isn't mandatory.
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
[Jörg Krause: update for version 2015.07]
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
[Romain: update for version 2017.05
|
||||
after commit 9d80b49a671c9922931adcd823aab0ed319a42d1]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
tools/env/fw_env.h | 11 -----------
|
||||
tools/env/fw_env_private.h | 11 -----------
|
||||
1 file changed, 11 deletions(-)
|
||||
|
||||
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
|
||||
index 57149e7..50049fe 100644
|
||||
--- a/tools/env/fw_env.h
|
||||
+++ b/tools/env/fw_env.h
|
||||
@@ -8,17 +8,6 @@
|
||||
#include <aes.h>
|
||||
#include <stdint.h>
|
||||
diff --git a/tools/env/fw_env_private.h b/tools/env/fw_env_private.h
|
||||
index 0c27da0..e550463 100644
|
||||
--- a/tools/env/fw_env_private.h
|
||||
+++ b/tools/env/fw_env_private.h
|
||||
@@ -5,17 +5,6 @@
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
-/* Pull in the current config to define the default environment */
|
||||
-#include <linux/kconfig.h>
|
||||
@@ -40,5 +43,5 @@ index 57149e7..50049fe 100644
|
||||
* To build the utility with the static configuration
|
||||
* comment out the next line.
|
||||
--
|
||||
2.7.4
|
||||
2.9.4
|
||||
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001
|
||||
From: Paul Kocialkowski <contact@paulk.fr>
|
||||
Date: Fri, 2 Mar 2018 23:13:42 +0100
|
||||
Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path
|
||||
|
||||
There are no headers for libfdt in lib/libfdt, as they are instead
|
||||
located in scripts/dtc/libfdt. Specifying lib/libfdt for headers
|
||||
inclusion in host tools results in using the system libfdt headers,
|
||||
which is not what we want. Change this to the proper path.
|
||||
|
||||
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
|
||||
[Backport from upstream commit e0d20dc1521e74b82dbd69be53a048847798a90a]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
tools/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/Makefile b/tools/Makefile
|
||||
index d3387fad69..f38f68ee47 100644
|
||||
--- a/tools/Makefile
|
||||
+++ b/tools/Makefile
|
||||
@@ -244,7 +244,7 @@ endif # !LOGO_BMP
|
||||
#
|
||||
HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \
|
||||
$(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
|
||||
- -I$(srctree)/lib/libfdt \
|
||||
+ -I$(srctree)/scripts/dtc/libfdt \
|
||||
-I$(srctree)/tools \
|
||||
-DUSE_HOSTCC \
|
||||
-D__KERNEL_STRICT_NAMES \
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -63,8 +63,8 @@ config BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE
|
||||
Install the mkenvimage tool on the target system
|
||||
|
||||
The mkenvimage tool from Das U-Boot bootloader, which allows
|
||||
generation of a valid binary environment image from a text file
|
||||
describing the key=value pairs of the environment.
|
||||
generation of a valid binary environment image from a text
|
||||
file describing the key=value pairs of the environment.
|
||||
|
||||
config BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
|
||||
bool "fw_printenv"
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2 u-boot-2017.01.tar.bz2
|
||||
sha256 938f597394b33e82e5af8c98bd5ea1a238f61892aabef36384adbf7ca5b52dda u-boot-2018.01.tar.bz2
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UBOOT_TOOLS_VERSION = 2017.01
|
||||
UBOOT_TOOLS_VERSION = 2018.01
|
||||
UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
|
||||
UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
|
||||
UBOOT_TOOLS_LICENSE = GPLv2+
|
||||
UBOOT_TOOLS_LICENSE = GPL-2.0+
|
||||
UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
|
||||
UBOOT_TOOLS_INSTALL_STAGING = YES
|
||||
|
||||
@@ -19,10 +19,11 @@ endef
|
||||
UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
HOSTCFLAGS="$(HOST_CFLAGS)" \
|
||||
STRIP=$(TARGET_STRIP)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),y)
|
||||
UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y
|
||||
UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y CONFIG_MKIMAGE_DTC_PATH=dtc
|
||||
UBOOT_TOOLS_DEPENDENCIES += dtc
|
||||
endif
|
||||
|
||||
@@ -35,7 +36,7 @@ define UBOOT_TOOLS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \
|
||||
CROSS_BUILD_TOOLS=y tools-only
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \
|
||||
env no-dot-config-targets=env
|
||||
envtools no-dot-config-targets=envtools
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE),y)
|
||||
@@ -63,9 +64,6 @@ define UBOOT_TOOLS_INSTALL_DUMPIMAGE
|
||||
endef
|
||||
endif
|
||||
|
||||
define UBOOT_TOOLS_INSTALL_LIBUBOOTENV
|
||||
endef
|
||||
|
||||
define UBOOT_TOOLS_INSTALL_STAGING_CMDS
|
||||
$(INSTALL) -D -m 0755 $(@D)/tools/env/lib.a $(STAGING_DIR)/usr/lib/libubootenv.a
|
||||
$(INSTALL) -D -m 0644 $(@D)/tools/env/fw_env.h $(STAGING_DIR)/usr/include/fw_env.h
|
||||
@@ -88,7 +86,7 @@ HOST_UBOOT_TOOLS_MAKE_OPTS = HOSTCC="$(HOSTCC)" \
|
||||
HOSTLDFLAGS="$(HOST_LDFLAGS)"
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),y)
|
||||
HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y
|
||||
HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y CONFIG_MKIMAGE_DTC_PATH=dtc
|
||||
HOST_UBOOT_TOOLS_DEPENDENCIES += host-dtc
|
||||
endif
|
||||
|
||||
@@ -102,9 +100,9 @@ define HOST_UBOOT_TOOLS_BUILD_CMDS
|
||||
endef
|
||||
|
||||
define HOST_UBOOT_TOOLS_INSTALL_CMDS
|
||||
$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin/mkimage
|
||||
$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/usr/bin/mkenvimage
|
||||
$(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/usr/bin/dumpimage
|
||||
$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/bin/mkimage
|
||||
$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage
|
||||
$(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
@@ -112,7 +110,7 @@ $(eval $(host-generic-package))
|
||||
|
||||
# Convenience variables for other mk files that make use of mkimage
|
||||
|
||||
MKIMAGE = $(HOST_DIR)/usr/bin/mkimage
|
||||
MKIMAGE = $(HOST_DIR)/bin/mkimage
|
||||
|
||||
# mkimage supports arm blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86
|
||||
# KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
|
||||
|
||||
Reference in New Issue
Block a user