From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F15F4C433FE for ; Sun, 20 Nov 2022 13:39:57 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3552D852E8; Sun, 20 Nov 2022 14:34:57 +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="Bzypr0T3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7ED3A8527F; Sun, 20 Nov 2022 14:34:22 +0100 (CET) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (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 738E485213 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-qk1-x731.google.com with SMTP id p18so6507007qkg.2 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=mW+o544acvPuq7g4U2d6niP58Gvuolyopdw84xAJMm8=; b=Bzypr0T3WrpjXAXpK3tO/BOaMuYVhEvNwrJ8PthwmhKjy3+pdKruHgOrAPcgAkF8E7 MWxz//0pGy/uo3bwWTuvtbXDEz2DS7TJxzBFD57XSe4TaNFznm2aSgMg/WSygEWylq22 YkYEp3JR2Lkhn/RalBYLhmT4l70MJXDXK05cA= 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=mW+o544acvPuq7g4U2d6niP58Gvuolyopdw84xAJMm8=; b=lw8jSCpa0N3iMUWOlLOQ6LYVUaQck122smAe9ZwozDwlnHs4ssAhyOOaMFEZ5A5Xpo PQGFaiyvavgGkM8Z0g+eoLzGVO1H7g9lGZGFlnyssEApQTTN85/ynTi+p6qoTS4uDtzR lIkf3lRW4vJhZtbeolbK76WqVuRTJ9GIuO81uSATe3JJaFR5hTfU0sVhsUQdJDmE4QsI nTcWXxoSc/Qf42uCnjVXfpAUbzyaI3bKd117wilgjSDTVUa34jxPC64//P1kNhsqq4vR qyA66y5KPbuesFOJz1uQguboGtsotS3gSZoom61wjzrlBfMEHe0SLAw5StgZNfINL/d8 sBLg== X-Gm-Message-State: ANoB5pk7fBtMfLZPeywBy4DovC59EWIOBHwEpMno8kyG/BXeqDiNBejn jMYcbdCIwFVA1ZJFEG63QVM/lYrR9Nnkqw== X-Google-Smtp-Source: AA0mqf5/s0Cz5FhsTTpj+5TlEYooORhOy9WMKy9MHdkGA64gEd4x/K2/t7n6sRWbN4oith0cf87lnw== X-Received: by 2002:a05:620a:2694:b0:6f6:b34a:5333 with SMTP id c20-20020a05620a269400b006f6b34a5333mr12924958qkp.1.1668951258907; 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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:18 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 033/241] global: Migrate CONFIG_FLASH_VERIFY to CFG Date: Sun, 20 Nov 2022 08:30:24 -0500 Message-Id: <20221120133352.3055600-34-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 Content-Transfer-Encoding: 8bit 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 +- common/flash.c | 2 +- include/configs/mccmon6.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 0c8932425cad..02ae72e009ef 100644 --- a/README +++ b/README @@ -1486,7 +1486,7 @@ Configuration Settings: digits and dots. Recommended value: 45 (9..1) for 80 column displays, 15 (3..1) for 40 column displays. -- CONFIG_FLASH_VERIFY +- CFG_FLASH_VERIFY If defined, the content of the flash (destination) is compared against the source after the write operation. An error message will be printed when the contents are not identical. diff --git a/common/flash.c b/common/flash.c index 848f44e59dfd..5ca715efad2b 100644 --- a/common/flash.c +++ b/common/flash.c @@ -166,7 +166,7 @@ flash_write(char *src, ulong addr, ulong cnt) src += len; } -#if defined(CONFIG_FLASH_VERIFY) +#if defined(CFG_FLASH_VERIFY) if (memcmp(src_orig, addr_orig, cnt_orig)) { printf("\nVerify failed!\n"); return ERR_PROG_ERROR; diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 4be47e78d676..9b2777339a10 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -25,7 +25,7 @@ /* NOR 16-bit mode */ #define CFG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR -#define CONFIG_FLASH_VERIFY +#define CFG_FLASH_VERIFY /* NOR Flash MTD */ #define CFG_SYS_FLASH_BANKS_LIST { (CFG_SYS_FLASH_BASE) } diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 16467a0bb8c9..8f68c6e736f6 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -33,7 +33,7 @@ CFG_FLASH_OR_PRELIM CFG_FLASH_SECTOR_SIZE CFG_FLASH_SHOW_PROGRESS CFG_FLASH_SPANSION_S29WS_N -CONFIG_FLASH_VERIFY +CFG_FLASH_VERIFY CONFIG_FM_PLAT_CLK_DIV CONFIG_FSL_CPLD CONFIG_FSL_ESDHC_PIN_MUX -- 2.25.1