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 F05F7C4321E for ; Sun, 4 Dec 2022 15:10:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B1857854AA; Sun, 4 Dec 2022 16:07:02 +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="t3EsbdPU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6B7FA85428; Sun, 4 Dec 2022 16:06:24 +0100 (CET) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 C9021852FC for ; Sun, 4 Dec 2022 16:06:21 +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-ej1-x62e.google.com with SMTP id bj12so22253269ejb.13 for ; Sun, 04 Dec 2022 07:06:21 -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=wo+Pchw3rxQ841UssHkTse5UGKn3M3z4tEVEiJCe9Fw=; b=t3EsbdPU+0HoDWr8BBOMevCLJImR2HDGxhnS9rauRh6xjWZrZxgZPK5Rf7SBTI07Rr F8Kc5dgwQc2xmApv6XdZ+c/UDckhO1YAFFftaI1bEVbwB5yvojHbFk9PKjD2LKH5OLfX PfODDbwT4WQT5+UwVrqUVPefkgUPtLsFKNBis= 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=wo+Pchw3rxQ841UssHkTse5UGKn3M3z4tEVEiJCe9Fw=; b=O9GaHGCsk/vG4aBGorjqr/YBByqp+j1QKwYLof2UhWeHu8pwdtToC2p56Jd+cvT0d3 VeNMRbAiAh73pbhoOs/sVV54FHy1/sF/r2d8f1VZlUkW76ED5h7neQHyS/1MCMDkH7VL WTDIw+4jAkoLqasoeCqqFvLDMoRIdETUnUeGkQs6fPXX20OojRUJ/9Snna3ZmYPrquBx hjPsQQTlGYYHodC02Ol87I6NcEccL7s02oBOcFUcLmBXoGQ/bTKKxvF12s7VZidjqLzl DsSycu8za/N9y5FVOACckAodZWczFnneD/BJjznADQvvAictixqclg6bTylOdnbUyqGe faTw== X-Gm-Message-State: ANoB5pnyeQvTLwAQCaCKkM1pcEcNrHVccISUzxcrlIjFIP20R7JVFzAT xbNTf9TXEwPFSFx9vDYRBJpHIlwvABm24Ctg X-Google-Smtp-Source: AA0mqf7Jd/pvN/juFNYVfmIDm82j8Qy83oP+LtiOCDE9JJzE5PaRm314je/U7ijfw5esi2s/ptdC6g== X-Received: by 2002:a17:906:2804:b0:78d:e7c0:a2b with SMTP id r4-20020a170906280400b0078de7c00a2bmr67706029ejc.273.1670166381255; Sun, 04 Dec 2022 07:06:21 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0073dc5bb7c32sm5240058eja.64.2022.12.04.07.06.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:20 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 022/149] global: Migrate CONFIG_ENV_TOTAL_SIZE to CFG Date: Sun, 4 Dec 2022 10:03:47 -0500 Message-Id: <20221204150554.4165941-22-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204150554.4165941-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204150554.4165941-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 Perform a simple rename of CONFIG_ENV_TOTAL_SIZE to CFG_ENV_TOTAL_SIZE Signed-off-by: Tom Rini --- include/configs/km/pg-wcom-ls102xa.h | 8 ++++---- include/configs/kmcent2.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 45997c75128c..eb9dd48bd7fe 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -169,7 +169,7 @@ * Environment */ -#define CONFIG_ENV_TOTAL_SIZE 0x40000 +#define CFG_ENV_TOTAL_SIZE 0x40000 #define ENV_DEL_ADDR CONFIG_ENV_ADDR_REDUND /* direct for newenv */ #ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ @@ -208,11 +208,11 @@ #define CONFIG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "protect on " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" + " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0" #define CONFIG_HW_ENV_SETTINGS \ "hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi," \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 580d3a0faf01..4e5cdf640d27 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -138,7 +138,7 @@ #define CFG_SYS_NUM_CPC CONFIG_SYS_NUM_DDR_CTLRS /* Environment in parallel NOR-Flash */ -#define CONFIG_ENV_TOTAL_SIZE 0x040000 +#define CFG_ENV_TOTAL_SIZE 0x040000 #define ENV_DEL_ADDR 0xebf00000 /*direct for newenv*/ /* @@ -428,11 +428,11 @@ int get_scl(void); #define CONFIG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "protect on " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" + " +" __stringify(CFG_ENV_TOTAL_SIZE) "\0" /* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */ #ifndef CONFIG_KM_DEF_ARCH -- 2.25.1