From patchwork Sun Nov 20 13:30:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1706724 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=T3sPkaJ8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFWlx12djz23lt for ; Mon, 21 Nov 2022 00:37:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D16748529B; Sun, 20 Nov 2022 14:34:34 +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="T3sPkaJ8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A267A85202; Sun, 20 Nov 2022 14:34:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 3A6D4851DB for ; Sun, 20 Nov 2022 14:34:08 +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-qk1-x735.google.com with SMTP id i9so6486036qki.10 for ; Sun, 20 Nov 2022 05:34:08 -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=oxlCNpZke1Un+pFSpWoldOh/R3PITZDgO7/KHFAL+nM=; b=T3sPkaJ8+RhoRNw8XtWPjREibxwqxZXuf//+PNpUe0M4NitYD4RyOMLRoE5Ry93oj9 j+mWpk3i8JlYppy52iLnwtyFgs4dZPhQ1Cj5Zg0Z3zDrW0flR6Uop9C3slQHBRafA6eV g9LtbVezKUk4cqpnsNKcTy+Z/yZLMic9gmON4= 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=oxlCNpZke1Un+pFSpWoldOh/R3PITZDgO7/KHFAL+nM=; b=Y+UeH0sVjczNiarNzxZUl47WSTUP/BpcVHOqzi2pd8YEO7Y1h9XQdiTfnwgIscrPTV T8LLePPoxM8mfQ18wylsJYaD5pke0WarR5QGbVWUiCT0ul0ZEXYvUpb3VdYootlcWjYn Ug2xqOVY2usKWIdm4/1szGzna8Bcf0vjY1E1bAlk9qP8XbG8xyhGAJW3xSBd6ER1TrL9 3wqvF9whoHcHJN3zfOEeGgBQKWRa+Fm52+9+YGs0AOUUFdx+L0Cd0G7wziOCU61WDYLu 6HBmQYMTUmDeUhriOwIaz69I0pK5+4miTr+kvaKw5Il5qSYDSmOt9k+eg7yx8Bv1WNKK GO7w== X-Gm-Message-State: ANoB5pkwrSv4kr1d1lVglSs3jdP4gbHImii6OkZMF3bQPiQu5+T9+h3y a2hGSbqwMwzUx11Kq2TyKKBfqtT4SJ/hEA== X-Google-Smtp-Source: AA0mqf7o4yfuaWjyTORj2odtkuYenJGTb8r5NUen0q+Rj1C8CHSQmj0cqY40p7dW3VQreZ97RIaJHQ== X-Received: by 2002:a37:9ad7:0:b0:6ee:aeae:6891 with SMTP id c206-20020a379ad7000000b006eeaeae6891mr12769751qke.717.1668951246637; Sun, 20 Nov 2022 05:34:06 -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.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 05:34:06 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 015/241] global: Migrate CONFIG_ENV_SETTINGS_V1 to CFG Date: Sun, 20 Nov 2022 08:30:06 -0500 Message-Id: <20221120133352.3055600-16-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 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 c6a01270a54d..48f49906b84e 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -36,7 +36,7 @@ "preboot=draco_led 0\0" \ CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \ "splashpos=m,m\0" \ - CONFIG_ENV_SETTINGS_V1 \ + CFG_ENV_SETTINGS_V1 \ CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ diff --git a/include/configs/rut.h b/include/configs/rut.h index f51771f9ca46..b07d0c50604d 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -33,7 +33,7 @@ "nand_img_size=0x500000\0" \ "splashpos=m,m\0" \ "optargs=fixrtc --no-log consoleblank=0 \0" \ - CONFIG_ENV_SETTINGS_V1 \ + CFG_ENV_SETTINGS_V1 \ CFG_ENV_SETTINGS_NAND_V1 \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index b1cd614316d4..c54b02c5919a 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -234,7 +234,7 @@ "${nand_img_size}; bootm ${kloadaddr}\0" \ COMMON_ENV_NAND_CMDS -#define CONFIG_ENV_SETTINGS_V1 \ +#define CFG_ENV_SETTINGS_V1 \ COMMON_ENV_SETTINGS \ "net_args=run bootargs_defaults;" \ "mtdparts default;" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e55368c5453c..26821890137d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -15,7 +15,7 @@ CFG_ENV_IS_EMBEDDED CFG_ENV_SETTINGS_BUTTONS_AND_LEDS CFG_ENV_SETTINGS_NAND_V1 CFG_ENV_SETTINGS_NAND_V2 -CONFIG_ENV_SETTINGS_V1 +CFG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V2 CONFIG_ENV_SROM_BANK CONFIG_ENV_TOTAL_SIZE