From patchwork Sun Oct 12 14:45:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 398964 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 219E714017D for ; Mon, 13 Oct 2014 01:45:22 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 429F132F0C; Sun, 12 Oct 2014 14:45:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2FWj2kjanWUJ; Sun, 12 Oct 2014 14:45:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0799B2F39C; Sun, 12 Oct 2014 14:45:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id A914A1C2254 for ; Sun, 12 Oct 2014 14:45:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A5788A19CB for ; Sun, 12 Oct 2014 14:45: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 EYh7PIcRA-Xc for ; Sun, 12 Oct 2014 14:45:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by fraxinus.osuosl.org (Postfix) with ESMTPS id AA202A19AB for ; Sun, 12 Oct 2014 14:45:17 +0000 (UTC) Received: by mail-wg0-f48.google.com with SMTP id k14so7078502wgh.7 for ; Sun, 12 Oct 2014 07:45:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=GPEGr4zGWm7ar6LYYnWGEvKMR6z3e7exs18ovDFOR5M=; b=wu4RjYWUjLZSbUXtedwwb0IQf6kTA+up8OpG5Pv8cmU1x2kHsOGJv11pgnTIVDgkrG KvTeO5XGKC2PaS/aWg5IDNqX0fi6guaxASgOlXIWK8egqJN9CkhfeLVmLIUPsChzVebe IxcyiLtJW0JlzOWXuN/C3JcT2ztE3DF5YdorOb/dzbpkJm3vMqzacX5jFPSqUyT6Mq7V EbK1Ggri2PgWChlERDj2qkk926Vb2eistIQi/HxmqLI1wrzj/H2Qwt3b1/fb0/vNKGmN iGSBv+RylI7aBESWLbR8240HdhlRPuvmBibkV6ufTNKSouxTl8UEHbZ/A09Kse9D/HTM Yq1A== X-Received: by 10.180.85.41 with SMTP id e9mr15361361wiz.21.1413125116218; Sun, 12 Oct 2014 07:45:16 -0700 (PDT) Received: from cerise.localdomain (dsdf-4d0a7c97.pool.mediaWays.net. [77.10.124.151]) by mx.google.com with ESMTPSA id q2sm9030206wiy.23.2014.10.12.07.45.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Oct 2014 07:45:15 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Sun, 12 Oct 2014 16:45:12 +0200 Message-Id: <1413125112-14417-1-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.1.1 Subject: [Buildroot] [PATCH v3] uboot-tools: Allow users to use uboot's sources X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" If the user has specified a custom U-Boot repository, he may also want to use it for U-Boot tools. This could be usefull in two identified use case: - User want the same version for U-Boot tools and U-Boot - User has modified U-Boot tools in his U-Boot repository Signed-off-by: Maxime Hadjinlian --- Changes v2 -> v3: - Add a help on the choice option to warn users on the minimal version needed for U-Boot Changes v1 -> v2: - Add a choice option (Suggested by Luca Ceresoli) - Add an if/then/else structure (Suggested by Luca Ceresoli) - Take UBOOT_LICENSE and UBOOT_LICENCE_FILES into account (Suggested by Arnout Vandecappelle) --- package/uboot-tools/Config.in | 21 +++++++++++++++++++++ package/uboot-tools/uboot-tools.mk | 13 +++++++++++++ 2 files changed, 34 insertions(+) diff --git a/package/uboot-tools/Config.in b/package/uboot-tools/Config.in index 7c8f17c..29957ad 100644 --- a/package/uboot-tools/Config.in +++ b/package/uboot-tools/Config.in @@ -7,6 +7,27 @@ config BR2_PACKAGE_UBOOT_TOOLS if BR2_PACKAGE_UBOOT_TOOLS +if BR2_TARGET_UBOOT + +choice + prompt "version" + default BR2_PACKAGE_UBOOT_TOOLS_LATEST_VERSION + help + Select the specific uboot-tools version you want to use + +config BR2_PACKAGE_UBOOT_TOOLS_LATEST_VERSION + bool "Use latest upstream version" + +config BR2_PACKAGE_UBOOT_TOOLS_USE_UBOOT_VERSION + bool "Use the same version as the uboot package" + help + You *MUST* use at least U-Boot 2014.04. Since then, changes happened in + the build infrastructur which lead to build breakage. + +endchoice + +endif + config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE bool "mkimage" help diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 2e720ac..09735e5 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,11 +4,24 @@ # ################################################################################ +ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_USE_UBOOT_VERSION),y) +# We have to use the BR2_TARGET_UBOOT_VERSION because of the order of inclusion +# of the mk files. +UBOOT_TOOLS_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION)) +UBOOT_TOOLS_SOURCE = $(UBOOT_SOURCE) +UBOOT_TOOLS_SITE = $(UBOOT_SITE) +ifneq ($(UBOOT_SITE_METHOD),) +UBOOT_TOOL_SITE_METHOD = $(UBOOT_SITE_METHOD) +endif +UBOOT_TOOLS_LICENSE = $(UBOOT_LICENSE) +UBOOT_TOOLS_LICENSE_FILES = $(UBOOT_LICENSE_FILES) +else UBOOT_TOOLS_VERSION = 2014.07 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_FILES = Licenses/gpl-2.0.txt +endif define UBOOT_TOOLS_BUILD_CMDS $(MAKE) -C $(@D) \