From patchwork Sat Aug 7 05:00:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1514572 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=l2qWbHpx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GhVXz0WpPz9s24 for ; Sat, 7 Aug 2021 15:00:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 32DBD8311A; Sat, 7 Aug 2021 07:00:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="l2qWbHpx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 097C38311A; Sat, 7 Aug 2021 07:00:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 535168262E for ; Sat, 7 Aug 2021 07:00:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pl1-x634.google.com with SMTP id z3so9896493plg.8 for ; Fri, 06 Aug 2021 22:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AtfAWfPqNSVgr/SMLYIJ8s2TpRR9BWFl/vaAEhZACOs=; b=l2qWbHpxytYJ65yb5KT5kj1hbBMQDIgGQ24MBiV+/gcq6jW4bayGqFNeWAhSSm4W9p dz+z5NkpqaZ9mTSHiKf4GRsCoLO0q24U/zPD9huEo2KLRhLOxOAIxR8dJ1a7spHhfIHV E2+sLDwlnOCwr+A8A/Cqd1Wh3mutBmPrdSPLcD8NckZM4XKd1CqFb5AsH3JElsgs4JFi GYn4ON0Uv+Ue/bAx0KFqKvJixWOnJF7vUZMdgQzBxHANVlOGvUDM/tQu8zHcMQxhKXAi +sXo8e1hdv85z/QytymXL3lRXknkwx2eSuy+eIOCegfBRLFafXHsOjWpag2kYhVJGGe6 aAqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AtfAWfPqNSVgr/SMLYIJ8s2TpRR9BWFl/vaAEhZACOs=; b=SUBMENnu22Ogh0nFlRrQVKi26nO+5kDAXf/SCMxTUIQWvBTxnazA0mrT/LkSpxkbZm FKzUmu/9iBXQJqC3T7zK4yv9NYeX576CMOxThs9/PlomJAsOJpYoUbc1auok9rsi4VNw 0qaO1b/uhZ7P2Od33UM1lPzpjwckRZjBFWdDGHI/4NRj13tqCkDYRf75CFQGpGKT8uup bwHsYZ/ru/hnBpBqPAYAihqx3OMm/1lgFkzqpfMyrXXsc4i4YfjU9Xon3vxOTnRaF2d3 kkd5TVnD9G+t+P3U2fi3co0JZX/YkZSydJixIxIjKPQHAzPZ2sdA4z6akeSv2DdOrfFe hmMA== X-Gm-Message-State: AOAM531fuXPe7CEmW34EMIDOknJJVnXN5rXYtCBjDsuaPb9ro5TZCe// X+sgPU0qbSGrOc5hWCDbWhyRhoJTDCY= X-Google-Smtp-Source: ABdhPJx9UlH5Fw82AwHlzG2PaCaecbXkmhoW7xG6tiW4NzU3GhNwrryj1tB7YAAAWKnf9t38G3obDQ== X-Received: by 2002:a17:902:9a46:b029:12c:9aae:daac with SMTP id x6-20020a1709029a46b029012c9aaedaacmr11448966plv.78.1628312411766; Fri, 06 Aug 2021 22:00:11 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id b7sm11785112pfl.195.2021.08.06.22.00.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Aug 2021 22:00:11 -0700 (PDT) From: Bin Meng To: Stefan Roese , u-boot@lists.denx.de Subject: [PATCH 2/3] flash.h: Remove CONFIG_SYS_FLASH_CFI from flash_info_t Date: Sat, 7 Aug 2021 13:00:01 +0800 Message-Id: <20210807050002.32723-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210807050002.32723-1-bmeng.cn@gmail.com> References: <20210807050002.32723-1-bmeng.cn@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Those embers wrapped with CONFIG_SYS_FLASH_CFI in struct flash_info_t are unconditionally used in the cfi_flash.c driver. Drop the #ifdefs in the definition of flash_info_t. Signed-off-by: Bin Meng Reviewed-by: Stefan Roese --- include/flash.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/flash.h b/include/flash.h index 42b18a6047..f3959f5012 100644 --- a/include/flash.h +++ b/include/flash.h @@ -21,7 +21,6 @@ typedef struct { ulong flash_id; /* combined device & manufacturer code */ ulong start[CONFIG_SYS_MAX_FLASH_SECT]; /* virtual sector start address */ uchar protect[CONFIG_SYS_MAX_FLASH_SECT]; /* sector protection status */ -#ifdef CONFIG_SYS_FLASH_CFI uchar portwidth; /* the width of the port */ uchar chipwidth; /* the width of the chip */ uchar chip_lsb; /* extra Least Significant Bit in the */ @@ -45,7 +44,6 @@ typedef struct { ulong addr_unlock2; /* unlock address 2 for AMD flash roms */ uchar sr_supported; /* status register supported */ const char *name; /* human-readable name */ -#endif #ifdef CONFIG_DM_MTD struct mtd_info *mtd; #endif