From patchwork Sun Jul 27 23:58:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Manning X-Patchwork-Id: 374068 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 537F21400FA for ; Mon, 28 Jul 2014 09:58:20 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4AE9032C0C; Sun, 27 Jul 2014 23:58:19 +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 MO7DMZpu3L8X; Sun, 27 Jul 2014 23:58:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C5CF332C06; Sun, 27 Jul 2014 23:58:16 +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 D74F71BF95C for ; Sun, 27 Jul 2014 23:58:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CF6DF8C796 for ; Sun, 27 Jul 2014 23:58:15 +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 U5kTnJtHz9Px for ; Sun, 27 Jul 2014 23:58:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id CE7718C751 for ; Sun, 27 Jul 2014 23:58:14 +0000 (UTC) Received: by mail-pa0-f44.google.com with SMTP id eu11so9407147pac.31 for ; Sun, 27 Jul 2014 16:58:14 -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=+1cL7m22JfGititZvFKwepqhlDT7nWqvrJYDA04o2Nw=; b=xxD3R2/o4k9q8zt1oLxmBId8ZjfjaL6TVAR0Q+Tqvza5IfzFc2XnenlqUsVhTedts5 /OxtP2RY6iR7jUMNJHowYfvS5hG3FCbE3E0VI+UkSk3DxxEn0byXgi+/m2nNpfWd3Je8 Xv2PZXrEXl+Js9O4fx/iCey1I7gLUiwH6pufUMTJXjALZ1VlaNBgJKnfDO1GcOMiZQnm 2TreKkSaqHt8JrZBFWRNaaBL+ZBFDwomQVnDXJSmHvFEx0N82E0NHrARIx1eQ9TeuYco wiyUviDXJdm9sPd6cG7cpTgpW15gitOU3fSi2CxZFZcM+zR5OBK460wt45zVwS3mPYDD 3yOQ== X-Received: by 10.67.5.3 with SMTP id ci3mr34911879pad.50.1406505494152; Sun, 27 Jul 2014 16:58:14 -0700 (PDT) Received: from charles-Aspire-5750.bluewaternz.com (mail.bluewatersys.com. [202.124.120.130]) by mx.google.com with ESMTPSA id av2sm15664965pbc.16.2014.07.27.16.58.12 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 27 Jul 2014 16:58:13 -0700 (PDT) From: Charles Manning To: buildroot@busybox.net Date: Mon, 28 Jul 2014 11:58:04 +1200 Message-Id: <1406505484-19123-1-git-send-email-cdhmanning@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] Add local directory support for uboot 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Charles Manning --- boot/uboot/Config.in | 12 ++++++++++++ boot/uboot/uboot.mk | 3 +++ 2 files changed, 15 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 46d1109..b489fae 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -34,6 +34,12 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT config BR2_TARGET_UBOOT_CUSTOM_HG bool "Custom Mercurial repository" +config BR2_TARGET_UBOOT_CUSTOM_LOCAL + bool "Local directory" + help + This option allows Buildroot to get the u-boot source + code from a local directory. + endchoice config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE @@ -70,6 +76,12 @@ config BR2_TARGET_UBOOT_VERSION default BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION \ if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG +config BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH + string "Path to the local directory" + depends on BR2_TARGET_UBOOT_CUSTOM_LOCAL + help + Path to the local directory with the u-boot source code. + config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR string "custom patch dir" help diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 532ac8b..2ae7d87 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -23,6 +23,9 @@ UBOOT_SITE_METHOD = git else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y) UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)) UBOOT_SITE_METHOD = hg +else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_LOCAL),y) +LINUX_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH)) +LINUX_SITE_METHOD = local else # Handle stable official U-Boot versions UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot