From patchwork Tue Mar 14 17:55:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 738853 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vjMpx5J7dz9ryr for ; Wed, 15 Mar 2017 04:55:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gmzHmSrF"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=PJKW68xf3WttmqQDnvRztj0+cTqMBxSNMHmrSmFO42A=; b=gmzHmSrF72n5Nr THfGI+gHRi9Gty8z7P5r3ezv/jYiMnyiqkWDUxvM/oIqhuvpU+3tX16Vhv90b0hWcWIBItBi+pLF+ IwsXUvTxc6Q+t2T34uzJd2wv/iw5KN25MNxtb0hAFn598KzBrpYroc5uMhikr4Ls9hQ0rK6WehzfE FyPo/dDct1e9eIusPO7206XVaY/oUnQpyQBDVBd6UGlow6ue6kPgiJ1GGKAmdUP2oM1L5YPPaJO4J wS9COZQysuqbbboIh8AkfYnhkv67jUZCvHw8BqhcTW105kUjt3jonMvTQVYywPhbqURW5b41GmOyG HeDdxW47ac8Y+de6uWhw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cnqfd-0002t3-Lh; Tue, 14 Mar 2017 17:55:41 +0000 Received: from mga07.intel.com ([134.134.136.100]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cnqfU-0002jr-Ol for lede-dev@lists.infradead.org; Tue, 14 Mar 2017 17:55:34 +0000 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP; 14 Mar 2017 10:55:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,165,1486454400"; d="scan'208";a="76592288" Received: from unknown (HELO mucrsb0001.muc.lantiq.com) ([10.62.163.96]) by fmsmga006.fm.intel.com with ESMTP; 14 Mar 2017 10:55:09 -0700 From: hauke.mehrtens@intel.com To: lede-dev@lists.infradead.org Date: Tue, 14 Mar 2017 18:55:02 +0100 Message-Id: <20170314175503.7073-1-hauke.mehrtens@intel.com> X-Mailer: git-send-email 2.10.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170314_105532_858870_EE54DB39 X-CRM114-Status: UNSURE ( 6.64 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [134.134.136.100 listed in list.dnswl.org] -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [134.134.136.100 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH 1/2] scripts: only generate config from feature flag if fully match X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Hauke Mehrtens Without this change the code checked if the string was contained in the feature option and not if the string matches the complete word. This only removes the nand option from the omap24xx target, the other changes are only removing options which were added twice. Signed-off-by: Hauke Mehrtens --- scripts/target-metadata.pl | 62 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/scripts/target-metadata.pl b/scripts/target-metadata.pl index 31de3c7..cbc3403 100755 --- a/scripts/target-metadata.pl +++ b/scripts/target-metadata.pl @@ -9,37 +9,37 @@ sub target_config_features(@) { my $ret; while ($_ = shift @_) { - /arm_v(\w+)/ and $ret .= "\tselect arm_v$1\n"; - /broken/ and $ret .= "\tdepends on BROKEN\n"; - /audio/ and $ret .= "\tselect AUDIO_SUPPORT\n"; - /display/ and $ret .= "\tselect DISPLAY_SUPPORT\n"; - /dt/ and $ret .= "\tselect USES_DEVICETREE\n"; - /gpio/ and $ret .= "\tselect GPIO_SUPPORT\n"; - /pci/ and $ret .= "\tselect PCI_SUPPORT\n"; - /pcie/ and $ret .= "\tselect PCIE_SUPPORT\n"; - /usb/ and $ret .= "\tselect USB_SUPPORT\n"; - /usbgadget/ and $ret .= "\tselect USB_GADGET_SUPPORT\n"; - /pcmcia/ and $ret .= "\tselect PCMCIA_SUPPORT\n"; - /rtc/ and $ret .= "\tselect RTC_SUPPORT\n"; - /squashfs/ and $ret .= "\tselect USES_SQUASHFS\n"; - /jffs2$/ and $ret .= "\tselect USES_JFFS2\n"; - /jffs2_nand/ and $ret .= "\tselect USES_JFFS2_NAND\n"; - /ext4/ and $ret .= "\tselect USES_EXT4\n"; - /targz/ and $ret .= "\tselect USES_TARGZ\n"; - /cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n"; - /minor/ and $ret .= "\tselect USES_MINOR\n"; - /ubifs/ and $ret .= "\tselect USES_UBIFS\n"; - /fpu/ and $ret .= "\tselect HAS_FPU\n"; - /spe_fpu/ and $ret .= "\tselect HAS_SPE_FPU\n"; - /ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n"; - /powerpc64/ and $ret .= "\tselect powerpc64\n"; - /nommu/ and $ret .= "\tselect NOMMU\n"; - /mips16/ and $ret .= "\tselect HAS_MIPS16\n"; - /rfkill/ and $ret .= "\tselect RFKILL_SUPPORT\n"; - /low_mem/ and $ret .= "\tselect LOW_MEMORY_FOOTPRINT\n"; - /small_flash/ and $ret .= "\tselect SMALL_FLASH\n"; - /nand/ and $ret .= "\tselect NAND_SUPPORT\n"; - /virtio/ and $ret .= "\tselect VIRTIO_SUPPORT\n"; + /^arm_v(\w+)$/ and $ret .= "\tselect arm_v$1\n"; + /^broken$/ and $ret .= "\tdepends on BROKEN\n"; + /^audio$/ and $ret .= "\tselect AUDIO_SUPPORT\n"; + /^display$/ and $ret .= "\tselect DISPLAY_SUPPORT\n"; + /^dt$/ and $ret .= "\tselect USES_DEVICETREE\n"; + /^gpio$/ and $ret .= "\tselect GPIO_SUPPORT\n"; + /^pci$/ and $ret .= "\tselect PCI_SUPPORT\n"; + /^pcie$/ and $ret .= "\tselect PCIE_SUPPORT\n"; + /^usb$/ and $ret .= "\tselect USB_SUPPORT\n"; + /^usbgadget$/ and $ret .= "\tselect USB_GADGET_SUPPORT\n"; + /^pcmcia$/ and $ret .= "\tselect PCMCIA_SUPPORT\n"; + /^rtc$/ and $ret .= "\tselect RTC_SUPPORT\n"; + /^squashfs$/ and $ret .= "\tselect USES_SQUASHFS\n"; + /^jffs2$/ and $ret .= "\tselect USES_JFFS2\n"; + /^jffs2_nand$/ and $ret .= "\tselect USES_JFFS2_NAND\n"; + /^ext4$/ and $ret .= "\tselect USES_EXT4\n"; + /^targz$/ and $ret .= "\tselect USES_TARGZ\n"; + /^cpiogz$/ and $ret .= "\tselect USES_CPIOGZ\n"; + /^minor$/ and $ret .= "\tselect USES_MINOR\n"; + /^ubifs$/ and $ret .= "\tselect USES_UBIFS\n"; + /^fpu$/ and $ret .= "\tselect HAS_FPU\n"; + /^spe_fpu$/ and $ret .= "\tselect HAS_SPE_FPU\n"; + /^ramdisk$/ and $ret .= "\tselect USES_INITRAMFS\n"; + /^powerpc64$/ and $ret .= "\tselect powerpc64\n"; + /^nommu$/ and $ret .= "\tselect NOMMU\n"; + /^mips16$/ and $ret .= "\tselect HAS_MIPS16\n"; + /^rfkill$/ and $ret .= "\tselect RFKILL_SUPPORT\n"; + /^low_mem$/ and $ret .= "\tselect LOW_MEMORY_FOOTPRINT\n"; + /^small_flash$/ and $ret .= "\tselect SMALL_FLASH\n"; + /^nand$/ and $ret .= "\tselect NAND_SUPPORT\n"; + /^virtio$/ and $ret .= "\tselect VIRTIO_SUPPORT\n"; } return $ret; }