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 3BE99C433FE for ; Sun, 20 Nov 2022 13:37:49 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F1AA852AC; Sun, 20 Nov 2022 14:34:41 +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="oWPGKGGr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 14954851E9; Sun, 20 Nov 2022 14:34:14 +0100 (CET) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (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 328FF85200 for ; Sun, 20 Nov 2022 14:34:09 +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-qt1-x82c.google.com with SMTP id z6so5900381qtv.5 for ; Sun, 20 Nov 2022 05:34:09 -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=uf4J/BxnPRpzuQu/ry/axBy+NQ+EXfICF488M3fF1Zc=; b=oWPGKGGrXaPnZoiYqfQMwwnqeCfUIGwU9Ci3l6NTgITKs8CJh6riLvDou3wFDhoE9g gt56TEqVBANHpQ7e/khVnttKzm//zbGafGPppfP/kBceCNLYzII0i8PFqJOLEkfLyNlC 8tS46YBs1/Xt5Y6ise+ZhzBtlI+Xo8xNMcAes= 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=uf4J/BxnPRpzuQu/ry/axBy+NQ+EXfICF488M3fF1Zc=; b=DiFCWTV0uCwhcmucBrohfuqgPYmwoIG+vr2I+m0Dg5eiPTEvM+9MHIvMo/oHn9PnhE eiysxhA0wKLqk3LeHzC2JKQLk8+Iss9vDpKgEdmH+7j1Tb5O/lB/hRWof02mUpw1eVkE HogckcWgyNYwCX3CkgVvkLn6IpmJI3TmlYHNcoKWFXMznZf7/E2fPvi2fTzH06avuuer cpDOQocvTpdDYXLSAeJn+H9OOfltmhZztJchqD3stkjKejiqsV2MQX30AX0us98X8qtJ UrjCV9BFYBMViUW+1mXfk7PfryWFYU26mr0idXsNkgSK/UL+KeY5V3O2CdHswHacW4Du Yjjg== X-Gm-Message-State: ANoB5pmBhnHmH2+Fi6VnsXOQ4bBowh+msmPhYN6TekoWd/tEQGd657Q9 FjND7vrTI9GZbY5ldCwSuaLUGYEym2LstQ== X-Google-Smtp-Source: AA0mqf5yvEiFHQDIvkVzQep/+Da7zgXtATlg2CPf0BhtUVZqhUe4Bso+9WbfP2/980IPVKWm8QYCqg== X-Received: by 2002:ac8:6e8a:0:b0:39d:85a:2399 with SMTP id c10-20020ac86e8a000000b0039d085a2399mr13678479qtv.648.1668951248680; Sun, 20 Nov 2022 05:34:08 -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.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:08 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 018/241] global: Migrate CONFIG_ENV_TOTAL_SIZE to CFG Date: Sun, 20 Nov 2022 08:30:09 -0500 Message-Id: <20221120133352.3055600-19-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 --- include/configs/km/pg-wcom-ls102xa.h | 8 ++++---- include/configs/kmcent2.h | 8 ++++---- scripts/config_whitelist.txt | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index dfa81c037f48..05cdcbfba193 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -172,7 +172,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 */ @@ -211,11 +211,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 527f0383bc65..17eb9a7c2ea0 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -139,7 +139,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*/ /* @@ -430,11 +430,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 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5de121b41ca0..27923ec86bf5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -18,7 +18,7 @@ CFG_ENV_SETTINGS_NAND_V2 CFG_ENV_SETTINGS_V1 CFG_ENV_SETTINGS_V2 CFG_ENV_SROM_BANK -CONFIG_ENV_TOTAL_SIZE +CFG_ENV_TOTAL_SIZE CONFIG_ET1100_BASE CONFIG_ETHBASE CONFIG_EXTRA_ENV_SETTINGS -- 2.25.1