From patchwork Mon Sep 2 20:07:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 272065 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 E1D232C0095 for ; Tue, 3 Sep 2013 06:08:55 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E75F332AF4; Mon, 2 Sep 2013 20:08:45 +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 bhgxSYkfcGcr; Mon, 2 Sep 2013 20:08:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 928A732AE2; Mon, 2 Sep 2013 20:08:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 39A9A1CE5C0 for ; Mon, 2 Sep 2013 20:08:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 316DF90C15 for ; Mon, 2 Sep 2013 20:08:34 +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 WfNH1d9HKp9U for ; Mon, 2 Sep 2013 20:08:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by whitealder.osuosl.org (Postfix) with ESMTPS id A29DB90C19 for ; Mon, 2 Sep 2013 20:08:32 +0000 (UTC) Received: by mail-ea0-f177.google.com with SMTP id f15so2502913eak.8 for ; Mon, 02 Sep 2013 13:08:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:content-type:mime-version:content-transfer-encoding:subject :message-id:in-reply-to:references:user-agent:date:from:to:cc; bh=i6WwzLq50LZE+F7S2n8X6iR3iD4EnLzfblU7a+mVAqU=; b=TxstSuRVVmBZ7Z44DE26lBDpELchId58zoaMLOPuEKWfw1OLaeebAlVhgxVX1LLBAx Qkn6mD382e7okKlAyD7tax0jkD2rIgse22I66h6Mjzv+kwy8PL6x3u9KDGoW27UIMrrT IxBZoXcr2UrXvTDoot5QtVaqm44Vdcz5aybSt3jS5QV65aR4OX18LFG43w44pZakueZn 7mPjyMLKjHUgv2OmGtLe/+2eazQ0STRtg+FjZCis6MVkohHOAE3qytxmkpFYmZjfyibb UkaxSM1Do3b7oQiyvafN0GnHGo1K68+GOq7okYKYzBmvp5BYD5A0Ot+5tQSrXEFnWP4r Kl+g== X-Received: by 10.14.109.201 with SMTP id s49mr4323003eeg.54.1378152511171; Mon, 02 Sep 2013 13:08:31 -0700 (PDT) Received: from [127.0.1.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id p5sm25251346eeg.5.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Sep 2013 13:08:30 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: c84935cb9450d64acb6ad60d4657ab15ac25dc55 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Mon, 02 Sep 2013 22:07:56 +0200 From: Thomas De Schampheleire To: buildroot@busybox.net Cc: thomas.petazzoni@free-electrons.com Subject: [Buildroot] [PATCH 7 of 9 v4] linux/uboot: line-up repository-related configuration options X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Although the configuration options for custom repository locations and versions are very similar between the linux and uboot packages, there are some minor differences. This patch lines up both packages. Signed-off-by: Thomas De Schampheleire --- v4: no changes v3: update after changes in previous patches v2: - remove 'HEAD/tip' defaults for repository version (comment Peter) - replace if/config/endif with config/depends for uboot tarball - move repo url/version settings before unrelated 'custom patch dir' Note: one remaining difference is that there are help texts in linux for options BR2_LINUX_KERNEL_CUSTOM_GIT and BR2_LINUX_KERNEL_CUSTOM_HG. I didn't add them to uboot because it seems a bit redundant, but if you prefer we can line this up as well (either add help texts to uboot or remove them from linux). boot/uboot/Config.in | 32 ++++++++++++++++---------------- linux/Config.in | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -40,10 +40,24 @@ config BR2_TARGET_UBOOT_CUSTOM_VERSION_V string "U-Boot version" depends on BR2_TARGET_UBOOT_CUSTOM_VERSION -if BR2_TARGET_UBOOT_CUSTOM_TARBALL - config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION string "URL of custom U-Boot tarball" + depends on BR2_TARGET_UBOOT_CUSTOM_TARBALL + +if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG + +config BR2_TARGET_UBOOT_CUSTOM_REPO_URL + string "URL of custom repository" + default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \ + if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" # legacy + +config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION + string "Custom repository version" + default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \ + if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy + help + Revision to use in the typical format used by Git/Mercurial + E.G. a sha id, a tag, branch, .. endif @@ -65,20 +79,6 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR Most users may leave this empty -if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG - -config BR2_TARGET_UBOOT_CUSTOM_REPO_URL - string "URL of custom repository" - default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \ - if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" # legacy - -config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION - string "Custom repository version" - default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \ - if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy - -endif - choice prompt "U-Boot binary format" default BR2_TARGET_UBOOT_FORMAT_BIN diff --git a/linux/Config.in b/linux/Config.in --- a/linux/Config.in +++ b/linux/Config.in @@ -47,7 +47,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL specific kernel source tarball config BR2_LINUX_KERNEL_CUSTOM_GIT - bool "Custom Git tree" + bool "Custom Git repository" help This option allows Buildroot to get the Linux kernel source code from a Git repository.