From patchwork Fri Apr 24 19:18:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Hunleth X-Patchwork-Id: 464379 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 4944F1402D1 for ; Sat, 25 Apr 2015 05:26:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 44D729311E; Fri, 24 Apr 2015 19:26:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yS1XD55R0nT5; Fri, 24 Apr 2015 19:26:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B0C4093192; Fri, 24 Apr 2015 19:26:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E17B21C25F1 for ; Fri, 24 Apr 2015 19:26:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DD67D9311E for ; Fri, 24 Apr 2015 19:26:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Aqk4+p4QPxQS for ; Fri, 24 Apr 2015 19:26:27 +0000 (UTC) X-Greylist: delayed 00:07:35 by SQLgrey-1.7.6 Received: from mail-qk0-f180.google.com (mail-qk0-f180.google.com [209.85.220.180]) by hemlock.osuosl.org (Postfix) with ESMTPS id 28C4E9310B for ; Fri, 24 Apr 2015 19:26:27 +0000 (UTC) Received: by qkgx75 with SMTP id x75so36350386qkg.1 for ; Fri, 24 Apr 2015 12:26:26 -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=c+1RplzBID+1QxCObKsjZpsgOVdFGTf0K80xMEaIyf8=; b=JSF2sfeXJJGVj7J0RYqBSPHtTEJjwZXothMSg7e2yNu5qPJpbeEKL8KcE4lLUeaeAS i8CX1NgEfz4K+DZ7dl7E5g9+HlqUxenimWbhtjwW913uO7x1IrS3BDYjgdIH7L+m/vmy kR1SBFd9qhc4dGNCQCtTSRj2QAWQffvbzp75sBXU3quqJ/AYtyZ1o4Opl3pOu2DaUuoL OWZABZ+x5yYLwWkPgfgWBj17Ee1FUbPvBP4wz63fl5dDLKRlPJU0I5DdXQMxhKGNmAh7 fR7ahPz4e+MQRcWsB4a+K//RAo+VuN41UDuIol7K/gM4YWYgDpSmLtZCtw8JjWEeB6LB 30ig== X-Gm-Message-State: ALoCoQnuttHMOeVIMJ+WAYfo76JJPyWUzlJbeBCbykNHjOCAJdXsVms/BPinVB5Jde3hXs3wQG/G X-Received: by 10.140.149.200 with SMTP id 191mr11614784qhv.15.1429903131505; Fri, 24 Apr 2015 12:18:51 -0700 (PDT) Received: from localhost.localdomain (173-166-182-69-washingtondc.hfc.comcastbusiness.net. [173.166.182.69]) by mx.google.com with ESMTPSA id c20sm8837062qka.21.2015.04.24.12.18.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Apr 2015 12:18:50 -0700 (PDT) From: Frank Hunleth To: buildroot@buildroot.org Date: Fri, 24 Apr 2015 15:18:35 -0400 Message-Id: <1429903115-29129-1-git-send-email-fhunleth@troodon-software.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH] uboot: BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR -> legacy 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" This changes BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR from deprecated to legacy. The added legacy handling will automatically copy the BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR setting to BR2_TARGET_UBOOT_PATCH, which should make upgrading configurations easier. Thanks to Arnout for suggesting the switch to legacy. Signed-off-by: Frank Hunleth --- Config.in.legacy | 15 +++++++++++++++ boot/uboot/Config.in | 12 ------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 70a9043..341d006 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -107,6 +107,21 @@ endif ############################################################################### comment "Legacy options removed in 2015.05" +config BR2_TARGET_UBOOT_PATCH + default BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != "" + +config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR + string "uboot: the custom patch dir option has been renamed" + help + The option BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR has been renamed to + BR2_TARGET_UBOOT_PATCH. Check that your configuration has been updated + correctly and delete this string. + +config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR_WRAP + bool + default y if BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR != "" + select BR2_LEGACY + config BR2_LINUX_KERNEL_EXT_RTAI_PATCH bool "RTAI patch file path has been removed" help diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 4f01499..acfbf5a 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -70,18 +70,6 @@ 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_PATCH_DIR - string "custom patch dir" - depends on BR2_DEPRECATED_SINCE_2015_05 - help - If your board requires custom patches, add the path to the - directory containing the patches here. The patches must be - named uboot-.patch. - - Most users may leave this empty - - NOTE: Use BR2_TARGET_UBOOT_PATCH instead. - config BR2_TARGET_UBOOT_PATCH string "Custom U-Boot patches" help