From patchwork Thu Jan 23 08:06:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 1227689 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=embedded.rocks Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" header.d=embedded.rocks header.i=@embedded.rocks header.a=rsa-sha256 header.s=default header.b=sDJQc4H8; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 483FHY1Wpwz9sSH for ; Thu, 23 Jan 2020 19:07:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6AF5886955; Thu, 23 Jan 2020 08:07:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0DLFyhhFVeaG; Thu, 23 Jan 2020 08:07:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A046886885; Thu, 23 Jan 2020 08:07:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AD3721BF3F9 for ; Thu, 23 Jan 2020 08:07:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AA1A386EB2 for ; Thu, 23 Jan 2020 08:07:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kmP1C7vyyZAL for ; Thu, 23 Jan 2020 08:07:13 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1E96C86BB9 for ; Thu, 23 Jan 2020 08:07:13 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id F013D2400FC for ; Thu, 23 Jan 2020 09:07:09 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 483FHK2pGvz9rxW for ; Thu, 23 Jan 2020 09:07:09 +0100 (CET) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1579766826; x=1580371627; bh=GPd8Mrn8cYdnX492UlTgVpLePWJ68MRGF544kaCmG2s=; b=sDJQc4H8r3ZO 7GG7lzYqMl35GkcABhEQDMrfw+hVVnDCzZWlJWQNAXT1QPmUNRgWdALALPvOUEPN 6dYcNAPoyfVGKsJCF7PQLO3tAfyqLDTuoYKjLvpZXgATytxRTfJ7CW4Kc5N8c6BM P/33Bt1NirEW1uwQ+ip7/bgzZGHqwSimwDvgqCMCSqQCNEieG03qHZ7gzHMKFnJo nDOWSPox4bJI4Dkq4UHjUxZxPI2gr6Hbw3jVs4J8k8zzuisSjTh0nOM9fngDJksn v4lL97PizNnC7FtrZ5HBtYlvd207taYMP1MycodImzDiVX1iKv0Qk7pTHOtB7/Ll GyMXN1a8JQ== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id dhEQYUaze7wI; Thu, 23 Jan 2020 09:07:06 +0100 (CET) Received: from nzxt.fritz.box (port-92-195-45-205.dynamic.as20676.net [92.195.45.205]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Thu, 23 Jan 2020 09:07:06 +0100 (CET) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Thu, 23 Jan 2020 09:06:51 +0100 Message-Id: <20200123080651.1002679-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/uboot-tools: bump to version 2020.01 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also: * Regenerate patch 0002 so it applies without hunk. * Add patch 0003, which drops generated/autoconf.h from imximage as we need uboot-tools without a board configuration. Signed-off-by: Jörg Krause --- ...-tools-only-in-no-dot-config-targets.patch | 2 +- .../0003-drop-autoconf.h-from-tools.patch | 36 +++++++++++++++++++ package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 package/uboot-tools/0003-drop-autoconf.h-from-tools.patch 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 33a79b16af..a376afbc75 100644 --- 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 @@ -28,7 +28,7 @@ diff --git a/Makefile b/Makefile index 6aa08964ff..fcec83d183 100644 --- a/Makefile +++ b/Makefile -@@ -443,7 +443,7 @@ defaultenv_h := include/generated/defaultenv_autogenerated.h +@@ -486,7 +486,7 @@ defaultenv_h := include/generated/defaultenv_autogenerated.h no-dot-config-targets := clean clobber mrproper distclean \ help %docs check% coccicheck \ diff --git a/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch b/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch new file mode 100644 index 0000000000..ab9cc9ab8b --- /dev/null +++ b/package/uboot-tools/0003-drop-autoconf.h-from-tools.patch @@ -0,0 +1,36 @@ +From 0552a8ffdfbb9807fcef4498011907caa5de2ace Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Krause?= +Date: Thu, 9 Jan 2020 15:11:32 +0100 +Subject: [PATCH 3/3] drop autoconf.h 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. + +imximage uses the DCD address from Kconfig to display this information +to the user. The default value for all i.MX platforms is 0x00910000, +except for i.MX7ULP, which has a DCD address of 0x2f010000. + +The default value printed before version 2020.01 was 0x00910000. + +Signed-off-by: Jörg Krause +--- + tools/imximage.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tools/imximage.c b/tools/imximage.c +index d7edd3c52f..f8d21fa06a 100644 +--- a/tools/imximage.c ++++ b/tools/imximage.c +@@ -11,7 +11,6 @@ + #include "imagetool.h" + #include + #include "imximage.h" +-#include + + #define UNDEFINED 0xFFFFFFFF + +-- +2.25.0 + diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 1dd2456449..6c17ef02b2 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 u-boot-2019.10.tar.bz2 +sha256 aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 u-boot-2020.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index f277a4c828..1f0bac5bf7 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2019.10 +UBOOT_TOOLS_VERSION = 2020.01 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+