From patchwork Sun Nov 20 13:30:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706740 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=HZ42B5B4; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFWqV2vQyz23n6 for ; Mon, 21 Nov 2022 00:40:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E4F40852F3; Sun, 20 Nov 2022 14:34:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="HZ42B5B4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 48FC88527F; Sun, 20 Nov 2022 14:34:23 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 A3D268526F for ; Sun, 20 Nov 2022 14:34:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf2a.google.com with SMTP id d18so2948225qvs.6 for ; Sun, 20 Nov 2022 05:34:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4R3l6TKM6dIUbOsszhe+/qstLiqMDPgJjOuJCEOheOA=; b=HZ42B5B4Q1pKWVmtLok/kXJEWGgD6KBHiXqDvEc5Rf0aeuMG2jtpoH8uZMhY9Pilu1 zuDa8Qy9ncMmM3Z+BMdL4UGrigurg/SMXpYwvZbOyzkcPgXopCQeLn6+XZEiyJguZl4t 0kK/WicfuVzo2jan/6Eau9sIiaRmInuNSiMYg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4R3l6TKM6dIUbOsszhe+/qstLiqMDPgJjOuJCEOheOA=; b=bDvlxThkaCR46JDInq9T1E8O2iwqfmzrl19RUJQBwUd1PiQ4prh1sr7rNDvAqAFUW/ KVt55QVAK3YQLo+sTQlOgEkF3ZHhSoPDwtx64lIxiTaujj4xJUeTmwFmRHNP0GdTX4v4 VqQLrERU9W7NQDaByeqnTGCg8VtffAjRT3KHgcoPBxc1lP2Aw3avw+MKHwsWDWl+ObJY IVuL5kppzsoFaXEJxWhCCHj7ImQHkeHvgx6vi57/XblNapqba/nwS9LOWq+At+fXp91g eWVmH5mfXzcR7vEV1G27hS2zyHZ2D1ooSIjCKPJ0fmiOeIpmzsZZXC/sGvOVHMjH8mmM PjdA== X-Gm-Message-State: ANoB5pldojyi4VAumBzlpCozEhCU2s06pPC9QApA6c4mx0jaD0IxA3Oz VJqcdzQxzcF216ukQKu3burIu0g/7t8Q4Q== X-Google-Smtp-Source: AA0mqf7o0iy/4AfEQwCQDJdv4hAJnZ2F6KzNGmnlEgDl5Txv+a0G97nuOKqh1tLTWNYvNr5wPCrqtA== X-Received: by 2002:a05:6214:5157:b0:4c6:942b:3a5c with SMTP id kh23-20020a056214515700b004c6942b3a5cmr513248qvb.1.1668951258186; Sun, 20 Nov 2022 05:34:18 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id m21-20020a05620a24d500b006ce0733caebsm6487740qkn.14.2022.11.20.05.34.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:17 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 032/241] global: Migrate CONFIG_FLASH_SPANSION_S29WS_N to CFG Date: Sun, 20 Nov 2022 08:30:23 -0500 Message-Id: <20221120133352.3055600-33-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120133352.3055600-1-trini@konsulko.com> References: <20221119234545.404563-38-trini@konsulko.com> <20221120133352.3055600-1-trini@konsulko.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- README | 2 +- drivers/mtd/cfi_flash.c | 2 +- include/configs/M53017EVB.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index ea5f4cc10659..0c8932425cad 100644 --- a/README +++ b/README @@ -1477,7 +1477,7 @@ Configuration Settings: - CONFIG_SYS_FLASH_USE_BUFFER_WRITE Use buffered writes to flash. -- CONFIG_FLASH_SPANSION_S29WS_N +- CFG_FLASH_SPANSION_S29WS_N s29ws-n MirrorBit flash has non-standard addresses for buffered write commands. diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 75765d76ea29..f3abe7842b69 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -991,7 +991,7 @@ static int flash_write_cfibuffer(flash_info_t *info, ulong dest, uchar *cp, case CFI_CMDSET_AMD_EXTENDED: flash_unlock_seq(info, sector); -#ifdef CONFIG_FLASH_SPANSION_S29WS_N +#ifdef CFG_FLASH_SPANSION_S29WS_N offset = ((unsigned long)dst - info->start[sector]) >> shift; #endif flash_write_cmd(info, sector, offset, AMD_CMD_WRITE_TO_BUFFER); diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index ad27766cf0f4..6d97e6ca84ab 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -93,7 +93,7 @@ * FLASH organization */ #ifdef CONFIG_SYS_FLASH_CFI -# define CONFIG_FLASH_SPANSION_S29WS_N 1 +# define CFG_FLASH_SPANSION_S29WS_N 1 # define CFG_SYS_FLASH_SIZE 0x1000000 /* Max size that the board might have */ #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c510c45d8795..16467a0bb8c9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -32,7 +32,7 @@ CFG_FLASH_BR_PRELIM CFG_FLASH_OR_PRELIM CFG_FLASH_SECTOR_SIZE CFG_FLASH_SHOW_PROGRESS -CONFIG_FLASH_SPANSION_S29WS_N +CFG_FLASH_SPANSION_S29WS_N CONFIG_FLASH_VERIFY CONFIG_FM_PLAT_CLK_DIV CONFIG_FSL_CPLD