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 8BCC3C4321E for ; Sun, 4 Dec 2022 15:16:28 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9BACC85532; Sun, 4 Dec 2022 16:08:38 +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="h+FFdutq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 03A0785499; Sun, 4 Dec 2022 16:07:01 +0100 (CET) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 68832853F7 for ; Sun, 4 Dec 2022 16:06: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=trini@konsulko.com Received: by mail-ed1-x52a.google.com with SMTP id d14so7636900edj.11 for ; Sun, 04 Dec 2022 07:06:58 -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=LLoFN+G7YdQ/0nnZu4+OnOce+krFvzuZT2V/UWjSB0Y=; b=h+FFdutqhLNlqdGCJufLdhVLZ8rot5YFvr0ZrdIib1Qd15+Mq9eGeS/yjgsKJHp5Rp TqJScUH6IDkdUVlmV4TA1yjAHWBGgLrDToMefSXEmyfgxhQLpDO0AmsihlDOEBMb8x7g Vl9L0mDa0DdTVVHAVzZeh3B99MyQlTAc647c0= 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=LLoFN+G7YdQ/0nnZu4+OnOce+krFvzuZT2V/UWjSB0Y=; b=x2AiEnjylmQR3DdweNSO2L11/VB0MOxYpXj86nCB83eVml508ar/VN0/tEF2cojUxY HNX15NajkjUXN5O4fn6IqptmlPQkezmzjrkm4Bg6sQc6YpwKZOITBFi58D2VchmR6Gwb c5Fxsw20ynNB/xGyfvJleWsLSuWHMN0L+AsUwlvkNlupXTonnl9iI8d1a883TBIiCPf/ U85WVomhOdJhSLLezID4prthYssFvSkVaB/TMJ/mdBNimxB6yfdiKF/AdlBfMnc9YlfO qNA5W+OXBZPyEGNhHmSOSMNL7ynnqeS/dPjrNLMz/zTLrPG0iVQd5/QQamz4OFrJnsI9 SZMA== X-Gm-Message-State: ANoB5pmFi8YNTHV9nJVzIqAoIn1k9O3kOHdIs/tDf2oxt4JIG7O2QSGP 8vl96+RIyXXK95fFPvtrB1iYKdojgjAYkbbz X-Google-Smtp-Source: AA0mqf4FSWZ7W7qZ5DJgoTcfnu0pN8RtUaPbMXbdQ9BcJOtPhb3nvdgF4UWh0Vx914LRGfdLsJoGZA== X-Received: by 2002:a05:6402:1013:b0:463:f3a:32ce with SMTP id c19-20020a056402101300b004630f3a32cemr55076744edu.366.1670166417929; Sun, 04 Dec 2022 07:06:57 -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.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:57 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 054/149] global: Migrate CONFIG_KM_NEW_ENV to CFG Date: Sun, 4 Dec 2022 10:04:19 -0500 Message-Id: <20221204150554.4165941-54-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_KM_NEW_ENV to CFG_KM_NEW_ENV Signed-off-by: Tom Rini --- include/configs/km/pg-wcom-ls102xa.h | 4 ++-- include/configs/kmcent2.h | 4 ++-- include/configs/socfpga_arria5_secu1.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index cc395682963a..4adecacd5ece 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -206,7 +206,7 @@ "checkfdt=true\0" \ "" -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ @@ -220,7 +220,7 @@ "asrc,spdif,lpuart1,ftm1\0" #define CFG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ CFG_KM_DEF_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 61b005a3c70c..8d98928a6eeb 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -426,7 +426,7 @@ int get_scl(void); "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ "usb_dr_mode=host\0" -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=protect off " __stringify(ENV_DEL_ADDR) \ " +" __stringify(CFG_ENV_TOTAL_SIZE) " && " \ "erase " __stringify(ENV_DEL_ADDR) \ @@ -442,7 +442,7 @@ int get_scl(void); #define CFG_EXTRA_ENV_SETTINGS \ CFG_KM_DEF_ENV \ CFG_KM_DEF_ARCH \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ CFG_HW_ENV_SETTINGS \ "EEprom_ivm=pca9547:70:9\0" \ "" diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 71aa5a7ca949..6fb7a895995b 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -42,7 +42,7 @@ "_fpga_loadsafe=echo Loading FPGA SAFE image..." \ " && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \ -#define CONFIG_KM_NEW_ENV \ +#define CFG_KM_NEW_ENV \ "newenv=" \ "nand erase 0x100000 0x40000\0" @@ -55,7 +55,7 @@ #define CFG_EXTRA_ENV_SETTINGS \ FPGA_RMTU_ENV \ CFG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_NEW_ENV \ + CFG_KM_NEW_ENV \ "socfpga_legacy_reset_compat=1\0" \ "altbootcmd=run bootcmd;\0" \ "bootlimit=6\0" \ -- 2.25.1