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 9B8F1C4321E for ; Sun, 4 Dec 2022 15:10:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 170618548B; Sun, 4 Dec 2022 16:06:53 +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="eg5goH9W"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 75863853DB; Sun, 4 Dec 2022 16:06:20 +0100 (CET) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) (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 53CFE85317 for ; Sun, 4 Dec 2022 16:06:17 +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-x62d.google.com with SMTP id qk9so4534529ejc.3 for ; Sun, 04 Dec 2022 07:06:17 -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=sUh2aXIGt7SwovcNrU6448eEchFI7MNKSP74fOvDNHk=; b=eg5goH9Waz5svMKH1SJi0HgYPf94jYFMpwy3ZiljMUqO7Wg7Xi+mq9usliEJ3fLCi+ CdPPBXG3cqXibHiPkfPgdaVKCENeiBY/hz3WBqnzQg+BZxtLsqYNRLb9P4FpcxLjiFGY 3uaE2qAadtdm7mwSRYHRpvjFNZT7I6myKLH0k= 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=sUh2aXIGt7SwovcNrU6448eEchFI7MNKSP74fOvDNHk=; b=DtxJ0YkLkB2FYSlD6ZyVOkybvrB+agrXEQHPDsqYLEnjYYTJPkjCeOT9YBtW8fT53o s9JMx3eoSVkYaUZtLxiN+Ebg94FcDY+U9JvPyqM9Ikrs/D2QjXueCy9Xh/GXb1EB/yXS Xxs6WpcMFa6s7f7r29ek2LCdSWQPCpGuaeaVmu9BcIHxV97FXT9FcjUglkIwmWDhoBaM dWOJy2SE9dKU5jVEbPKACOMoFtMJrAu2iHxm3zJ0emgOqAqVVTavSbxbTEEjs11fx3s/ F1gj80IfNNLW8gy9CRWjiFDHPa5rB7CS/OwsxDgDk5r5o7kDglWOW4wGj8/g9CVVoRcs gzDQ== X-Gm-Message-State: ANoB5pmUEIg4lSnbsWG/hJl8ep0qcNTnl2tYya009G2lW4cO2UTIfhlt FLu5TDTQrOCDbVJtyL3FKFrjS2wkKvz3bxTL X-Google-Smtp-Source: AA0mqf6Ki2ce9lxGI95Qz/3DhNmvVp2wIh3fl26PysifQTx0yKnwfiIlwCO/h/uMOCULTxb4821Smg== X-Received: by 2002:a17:906:a0c6:b0:7bd:3a5c:4dea with SMTP id bh6-20020a170906a0c600b007bd3a5c4deamr35990893ejb.190.1670166376771; Sun, 04 Dec 2022 07:06:16 -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.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:16 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 018/149] global: Migrate CONFIG_ENV_SETTINGS_NAND_V2 to CFG Date: Sun, 4 Dec 2022 10:03:43 -0500 Message-Id: <20221204150554.4165941-18-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_SETTINGS_NAND_V2 to CFG_ENV_SETTINGS_NAND_V2 Signed-off-by: Tom Rini --- include/configs/draco.h | 2 +- include/configs/etamin.h | 6 +++--- include/configs/rastaban.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/thuban.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/draco.h b/include/configs/draco.h index d1c7abe1b392..5b0daec11a6a 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -36,6 +36,6 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_DRACO_H */ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index 8bfc9c9f6297..c68d0df02a2b 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -93,8 +93,8 @@ "u-boot.env1 mtddev;" \ "rootfs mtddevubi" \ -#undef CONFIG_ENV_SETTINGS_NAND_V2 -#define CONFIG_ENV_SETTINGS_NAND_V2 \ +#undef CFG_ENV_SETTINGS_NAND_V2 +#define CFG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \ "rootfs_name=rootfs\0" \ "kernel_name=uImage\0"\ @@ -136,6 +136,6 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_ETAMIN_H */ diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 2e002faf2e60..f3435b2b8c6c 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -46,6 +46,6 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_RASTABAN_H */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 296ac34da637..7e9a55ec6103 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -273,7 +273,7 @@ "u-boot.env1 part 0 7;" \ "rootfs partubi 0 9" \ -#define CONFIG_ENV_SETTINGS_NAND_V2 \ +#define CFG_ENV_SETTINGS_NAND_V2 \ "nand_active_ubi_vol=rootfs_a\0" \ "rootfs_name=rootfs\0" \ "kernel_name=uImage\0"\ diff --git a/include/configs/thuban.h b/include/configs/thuban.h index 25c5a8ccd20e..960b42dffd0e 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -39,6 +39,6 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ CONFIG_ENV_SETTINGS_V2 \ - CONFIG_ENV_SETTINGS_NAND_V2 + CFG_ENV_SETTINGS_NAND_V2 #endif /* ! __CONFIG_THUBAN_H */ -- 2.25.1