From patchwork Fri Jul 21 21:12:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 792326 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BgrVkAlY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xDk4b3BQjz9s82 for ; Sat, 22 Jul 2017 07:12:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 34C2FC21D8B; Fri, 21 Jul 2017 21:12:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7B7CAC21D09; Fri, 21 Jul 2017 21:12:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8E510C21DB8; Fri, 21 Jul 2017 21:12:35 +0000 (UTC) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by lists.denx.de (Postfix) with ESMTPS id 80E57C21DA0 for ; Fri, 21 Jul 2017 21:12:35 +0000 (UTC) Received: by mail-wr0-f194.google.com with SMTP id c24so9498004wra.2 for ; Fri, 21 Jul 2017 14:12:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=jqkc5M/kyzM9XezRwXAhYC6fsZePAZQB/XqGKyIG3SU=; b=BgrVkAlYnOENtHwqVoq4QuQaxuHV0LRgJnu9zzplCc7GB+MQ+NGi7IvtPQrFMHH0y/ HLuGVT/eXDu1x/SDHp/UauJlL8RqmP5y6C0o3P7JfHGllKSALdKuCNz6y5YOgi0MnDNe JpW0S8+5rQQzWfGR5mcMM7UY5LNdYxsOUzjIXpLhfBoe3/OjKaTuVX5hewYjFppjOuKG rwoc0UNHfcDvnSVrWAHVVDZCIwpTYHqOzc0I2K0qJdJd5ihLDfdG0jiF5nDD3S2swhwB AAjkC0NTd25XhAS2+dzPRzzgzu+L+0f9Vx1WI9iyO08MV8zsHmTFFAd3GY2ZWITZRko6 ptcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jqkc5M/kyzM9XezRwXAhYC6fsZePAZQB/XqGKyIG3SU=; b=Oa8UCl/UuYRvx6w3c+gecg+qDyZnKEHs+Aq7TwSDokyAXg7Cc1t8oct8+xI6rvRw7n uEXev7VIM+03VjnLw8yPQ3BgmzuE0oHmmaQqP94IrihtD0rNNLw+k/dmsaxL+H+7wkn3 9X26TWD5/JlyktRZLTB0xEIYitJYO8r2XRegCdPnrG32t4a6MLIqBiQOOWJadk6cZgu0 OjbvJLvTV34+tcN/ciwLWKEseZHuSpW25+/NUNspkzf85tAQqb0dcRmaEkdAaxSZ/JQx bMy1zz26fIVkQWU3uHh0F3oRnsl5uDFtwiUsw4R/YS/95ugNcc9HOFIvcJ86/+xB5paZ WnvQ== X-Gm-Message-State: AIVw112RXRs2WT7cpWqguALNRBTHiMH83HBQcnqTgqAIrXqjJWFIqM3E uychbKsjO3sgdaJCnvs= X-Received: by 10.223.177.158 with SMTP id q30mr12212333wra.123.1500671555011; Fri, 21 Jul 2017 14:12:35 -0700 (PDT) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id k75sm1900970wmh.10.2017.07.21.14.12.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jul 2017 14:12:34 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Fri, 21 Jul 2017 23:12:29 +0200 Message-Id: <20170721211229.23365-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.11.0 Cc: Tom Rini , Marek Vasut Subject: [U-Boot] [PATCH] mtd: cfi: Zap CFI_FLASH_SHIFT_WIDTH redefinition X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This is defined twice in the same file, with the same value, likely because of some patch merge issue. Pick the uglier one and nuke it. Signed-off-by: Marek Vasut Cc: Tom Rini --- include/flash.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/flash.h b/include/flash.h index 2a5e13a13d..908d7cec6c 100644 --- a/include/flash.h +++ b/include/flash.h @@ -67,8 +67,6 @@ typedef unsigned long flash_sect_t; #define FLASH_CFI_BY16 0x02 #define FLASH_CFI_BY32 0x04 #define FLASH_CFI_BY64 0x08 -/* convert between bit value and numeric value */ -#define CFI_FLASH_SHIFT_WIDTH 3 /* * Values for the flash device interface */