From patchwork Fri Apr 17 20:26:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Hunleth X-Patchwork-Id: 462188 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 55609140293 for ; Sat, 18 Apr 2015 06:27:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 23408332C8; Fri, 17 Apr 2015 20:27:44 +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 LOvQQbZJY4Xt; Fri, 17 Apr 2015 20:27:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 825622FFD9; Fri, 17 Apr 2015 20:27:41 +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 A2FEE1C21A3 for ; Fri, 17 Apr 2015 20:27:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9C7FDA1382 for ; Fri, 17 Apr 2015 20:27:39 +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 dJSB_Lsa8M7U for ; Fri, 17 Apr 2015 20:27:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qc0-f177.google.com (mail-qc0-f177.google.com [209.85.216.177]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B340EA1335 for ; Fri, 17 Apr 2015 20:27:38 +0000 (UTC) Received: by qcyk17 with SMTP id k17so30529784qcy.1 for ; Fri, 17 Apr 2015 13:27:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4WUmVulcjFtCxlWzC9MiQ7+jQNkhehg6NxBmeQoZO28=; b=HJnUFkSufUVtNddr2htEieusjwz8d+YPtO/uNI7zGTOgOTCFLFYMSa248R/gjazJy9 Kxe3ta0AzXrcBKR28RwLG1+bhNcDCoLh64eRgirZZ/THrmX+5tKslvXX2BkT+AsdgXHU rgejhihi410JiI+J50kOugxP6wRtTEqA8eygELESc0zzbbdOJyPmX8tM1q83kqCHXAeH PfWqizWrgmkIcFeyuWY72xNpabkSRJH2wapg5DRKanmIMa4FaC/E9/t2Wnds2ziAS0CA vMvqCa9Wn06maOQyHe6hfuJ4iyK1A4JRbZUorbVhHt7k+1XrPV7hZZuo/p1Qmam8s3NL khVg== X-Gm-Message-State: ALoCoQnY7cyTSo9Egp68PfE8qGXHR0tGt/aQyQP7oxZDM3njxc67lXCM0R4wp4KtPiokJh93ZmOX X-Received: by 10.229.8.8 with SMTP id f8mr5912767qcf.4.1429302457547; Fri, 17 Apr 2015 13:27:37 -0700 (PDT) Received: from halfmarathon.lkctech.com (173-166-182-69-washingtondc.hfc.comcastbusiness.net. [173.166.182.69]) by mx.google.com with ESMTPSA id r198sm8873568qha.2.2015.04.17.13.27.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Apr 2015 13:27:36 -0700 (PDT) From: Frank Hunleth To: buildroot@buildroot.org Date: Fri, 17 Apr 2015 16:26:13 -0400 Message-Id: <1429302375-12275-1-git-send-email-fhunleth@troodon-software.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH 1/3] uboot: add support for patch files and URLs 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" The existing u-boot patch option only allowed directories to be specified. As suggested by Arnout Vandecappelle, hooking into the generic patch framework enables files and URLs to be specified. The downside is that patch directories need to be converted to lists of files to use this approach. This change is useful for Intel Edison support, so that Intel's u-boot patch can be downloaded rather than stored in the Buildroot source tree. Signed-off-by: Frank Hunleth --- boot/uboot/Config.in | 8 ++++++++ boot/uboot/uboot.mk | 2 ++ 2 files changed, 10 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 3f39ee8..32fcb21 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -79,6 +79,14 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR Most users may leave this empty +config BR2_TARGET_UBOOT_PATCHES + string "custom patches" + help + If your board requires custom patches, add a list of patches + here. + + Most users may leave this empty + choice prompt "U-Boot binary format" default BR2_TARGET_UBOOT_FORMAT_BIN diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 6b152ca..e9f90a2 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -101,6 +101,8 @@ endef UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CUSTOM_PATCHES endif +UBOOT_PATCH += $(call qstrip,$(BR2_TARGET_UBOOT_PATCHES)) + define UBOOT_CONFIGURE_CMDS $(TARGET_CONFIGURE_OPTS) \ $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \