boot/uboot: bump to version 2017.05
Fabio Estevam
reviewerPATCH v2 1/3 boot/uboot: bump to version 2017.05
Signed-off-by Fabio Estevam <[email protected]>
---
Changes since v1:
- None
boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
boot/uboot/Config.in +2 -2
@@ -38,7 +38,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2017.03" + bool "2017.05" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version"
@@ -86,7 +86,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2017.03" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2017.05" 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
boot/uboot/uboot.hash +1 -1
@@ -1,2 +1,2 @@ # Locally computed: -sha256 f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f u-boot-2017.03.tar.bz2 +sha256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e u-boot-2017.05.tar.bz2
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v2 2/3 uboot-tools: bump to version 2017.05
Bump to version 2017.05 and also remove the patches that have been upstreamed.
Signed-off-by Fabio Estevam <[email protected]>
---
Changes since v1:
- None
.../uboot-tools/0001-drop-configh-from-tools.patch | 44 ---------------------- ...y-CFLAGS-on-invocation-of-libfdt-setup.py.patch | 36 ------------------ package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 4 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 package/uboot-tools/0001-drop-configh-from-tools.patch delete mode 100644 package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch
package/uboot-tools/0001-drop-configh-from-tools.patch deleted +0 -44
@@ -1,44 +0,0 @@ -From b742c7590ac6d9ac72dd227679ccff79433b3512 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= <[email protected]> -Date: Tue, 4 Aug 2015 22:13:20 +0200 -Subject: [PATCH] drop configh from tools -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need to build u-boot tools without a board configuration for the target. -fw_env just uses config.h to define the default environment of the created -image, so it really isn't mandatory. - -Signed-off-by: Gustavo Zacarias <[email protected]> -[J?rg Krause: update for version 2015.07] -Signed-off-by: J?rg Krause <[email protected]> ---- - tools/env/fw_env.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> - --/* Pull in the current config to define the default environment */ --#include <linux/kconfig.h> -- --#ifndef __ASSEMBLY__ --#define __ASSEMBLY__ /* get only #defines from config.h */ --#include <config.h> --#undef __ASSEMBLY__ --#else --#include <config.h> --#endif -- - /* - * To build the utility with the static configuration - * comment out the next line. --- -2.7.4 -
package/uboot-tools/0004-Pass-empty-CFLAGS-on-invocation-of-libfdt-setup.py.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 7807af13118eff3ac291bbaaf2159c7a441c0902 Mon Sep 17 00:00:00 2001 -From: Max Filippov <[email protected]> -Date: Thu, 16 Mar 2017 11:21:58 -0700 -Subject: [PATCH] Pass empty CFLAGS on invocation of libfdt/setup.py - -When building u-boot tools in cross-build environment CFLAGS environment -variable set up for target is taken into an account when building code -for host. Make it empty on invocation of python. - -This fixes the following build errors when cross-compiling for xtensa: - - cc1: error: unrecognized command line option "-mlongcalls" - cc1: error: unrecognized command line option "-mauto-litpools" - -Signed-off-by: Max Filippov <[email protected]> -Reviewed-by: Simon Glass <[email protected]> ---- - tools/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index 1c840d7..f3de657 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -120,7 +120,7 @@ _libfdt.so-sharedobjs += $(LIBFDT_OBJS) - libfdt: - - tools/_libfdt.so: $(patsubst %.o,%.c,$(LIBFDT_OBJS)) tools/libfdt_wrap.c -- LDFLAGS="$(HOSTLDFLAGS)" python $(srctree)/lib/libfdt/setup.py \ -+ LDFLAGS="$(HOSTLDFLAGS)" CFLAGS= python $(srctree)/lib/libfdt/setup.py \ - "$(_hostc_flags)" $^ - mv _libfdt.so $@ - --- -2.1.4 -
package/uboot-tools/uboot-tools.hash +1 -1
@@ -1,2 +1,2 @@ # Locally computed: -sha256 f54baf3f9325bf444c7905f3a5b6f83680edb1e6e1a4d5f8a5ad80abe885113f u-boot-2017.03.tar.bz2 +sha256 c8373949d7f0de1059e507b83a655d4cea539f75dc66ccdbb27adbd38d83095e u-boot-2017.05.tar.bz2
package/uboot-tools/uboot-tools.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2017.03 +UBOOT_TOOLS_VERSION = 2017.05 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+
Signature · 1 line
2.7.4
Fabio Estevam
reviewerPATCH v2 3/3 imx6q-sabresd: Bump U-Boot and kernel versions
In reply to Fabio EstevamBump U-Boot to 2017.05 and kernel to 4.11.
Signed-off-by Fabio Estevam <[email protected]>
---
Changes since v1:
- Fix typo in commit log: 2017.05
configs/imx6q-sabresd_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
configs/imx6q-sabresd_defconfig +4 -4
@@ -4,8 +4,8 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=y -# Linux headers same as kernel, a 4.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +# Linux headers same as kernel, a 4.11 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -24,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05" BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.1" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
Signature · 1 line
2.7.4
PATCH v2 1/3 boot/uboot: bump to version 2017.05
In reply to Fabio EstevamHello,
Quoted 4 lines · Fabio Estevam
Signed-off-by Fabio Estevam <[email protected]>---
Changes since v1:
- None
All three patches applied to next. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com