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 19ED5C433FE for ; Sun, 20 Nov 2022 13:36:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DDAB68526F; Sun, 20 Nov 2022 14:34:28 +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="Uujk+ref"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 143B38524B; Sun, 20 Nov 2022 14:34:09 +0100 (CET) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (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 84EC6851EB for ; Sun, 20 Nov 2022 14:34:06 +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-x833.google.com with SMTP id e15so5910755qts.1 for ; Sun, 20 Nov 2022 05:34:06 -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=S42wX+TNy77yHi+VxJ19UceJ9/aaEcTmtXeiqB2m2sg=; b=Uujk+refdjmg4Pkt5ApX48kkAS+qnrEthCiKWHlLdCkp0vuAYt+RFKKLtpOlprH3Rd Ryaj7MqjJcdsWy9qKyVFIcZQIgpg+r90GGmEouP5+WTMdxC8hoUuew2+8ZKi+0fjRSIs OJ/rUwhgSoNfAYM1tO4F97Rf0EWlcTFZd+FbM= 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=S42wX+TNy77yHi+VxJ19UceJ9/aaEcTmtXeiqB2m2sg=; b=Yi/2PF9FJOrUNNtSQtRleXFIc5UbsFdO/APwREh4DSzwKbO+OR06KLkkpeJA9rfk0O zych27umn2IgF8WKXpMTTHoerRKhr0+3LMYUVECo92blM1bp3CuHKwL1uc0rGbJzgYEQ /8P6E3oF6x61s13FVQJVLAVQ5oIvKZTgEijXcDCUoREvtT4yGFC6NGYmSEgNa8X6osTK gvv5sjgbqCuF5dM1HZy7Fr5A+SI9VuB4wKlWqlPJEzHroe4DKu8nCsZKylIZ+fuOV58U vUIk0DEfUmKWvlKwGEuOmyoaUn+GR4N974YGrzGQyk3Q6qMcQ2t8EVRz/mRI2X5XVvPv F/ZQ== X-Gm-Message-State: ANoB5pnJ5S5n7LCPUTWp2YQ4KAYnjJJvCDGpQZ46myGhJdxVY/MRpO6t MDNBDysEFCt9PhQbszb+7/SEGQIHdQyHgg== X-Google-Smtp-Source: AA0mqf4fmbFMvrZvCodC4y8NEVyHto7LVNeus7+NKRwEeJC3hJzEE1nh4qW4aHxS+f6iCs4xq6R4gw== X-Received: by 2002:a05:622a:5c90:b0:3a5:6de2:b400 with SMTP id ge16-20020a05622a5c9000b003a56de2b400mr13541909qtb.631.1668951245207; Sun, 20 Nov 2022 05:34:05 -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.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:04 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 013/241] global: Migrate CONFIG_ENV_SETTINGS_NAND_V1 to CFG Date: Sun, 20 Nov 2022 08:30:04 -0500 Message-Id: <20221120133352.3055600-14-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/pxm2.h | 2 +- include/configs/rut.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index eafa6ae9a9a0..c6a01270a54d 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -37,7 +37,7 @@ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "splashpos=m,m\0" \ CONFIG_ENV_SETTINGS_V1 \ - CONFIG_ENV_SETTINGS_NAND_V1 \ + CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ "mmc_root_fs_type=ext4 rootwait\0" \ diff --git a/include/configs/rut.h b/include/configs/rut.h index ac48372b6c0b..f51771f9ca46 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -34,7 +34,7 @@ "splashpos=m,m\0" \ "optargs=fixrtc --no-log consoleblank=0 \0" \ CONFIG_ENV_SETTINGS_V1 \ - CONFIG_ENV_SETTINGS_NAND_V1 \ + CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ "mmc_root_fs_type=ext4 rootwait\0" \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 5a001716fb01..20efa468ac3d 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -201,7 +201,7 @@ "kernel_b part 0 8;" \ "rootfs partubi 0 10" -#define CONFIG_ENV_SETTINGS_NAND_V1 \ +#define CFG_ENV_SETTINGS_NAND_V1 \ "nand_active_ubi_vol=rootfs_a\0" \ "nand_active_ubi_vol_A=rootfs_a\0" \ "nand_active_ubi_vol_B=rootfs_b\0" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cb880dc317fc..25bfb7ee89e7 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -13,7 +13,7 @@ CFG_DW_WDT_CLOCK_KHZ CFG_ENV_FLAGS_LIST_STATIC CFG_ENV_IS_EMBEDDED CFG_ENV_SETTINGS_BUTTONS_AND_LEDS -CONFIG_ENV_SETTINGS_NAND_V1 +CFG_ENV_SETTINGS_NAND_V1 CONFIG_ENV_SETTINGS_NAND_V2 CONFIG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V2 -- 2.25.1