From patchwork Sun Feb 5 22:39:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1737834 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=85.214.62.61; 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=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=UgK86yqm; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P94Sn6K82z23j7 for ; Mon, 6 Feb 2023 09:54:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7A90C85B21; Sun, 5 Feb 2023 23:44:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="UgK86yqm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7ED0D85A54; Sun, 5 Feb 2023 23:43:02 +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,DKIMWL_WL_HIGH, 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-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) (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 E770B85A84 for ; Sun, 5 Feb 2023 23:42:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12f.google.com with SMTP id v1so58166ilg.5 for ; Sun, 05 Feb 2023 14:42:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=byoVme6kD5kRjZp1qLMSMcKM8qjHNjdm5nLo2JfcEuk=; b=UgK86yqmfgefQVAEtzH/cZXsPMZTfnJ1O/p4IYdqak7+Kxm1cOxi8LQPLO7y7Dtjju CpKdaeQHALIddRuyO2Yu6lSG6dD/NBcBUJIAlD4ThHXvIH7J+XKhR8w6T2FXJrBjKa9+ ATIzgfo2rOl6kpImu5qPPodPg2BVrrwPCqpp4= 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=byoVme6kD5kRjZp1qLMSMcKM8qjHNjdm5nLo2JfcEuk=; b=APegpZAI0/8NiwN8ieNn00p7DoTfD2qZu/3wp/H9uY3KfVIIji+RKJF3Kqd8+Hh8yC qJGw5CXjtGJAHv036nsZbeorKvJrduE7bJXlKuiZE4rBuUYnuMqvTQx7PjclImH+jhmJ TnHBJxzUKlWdDL9bAoqhKCE/rmRMLdsvqwjKUrb05Uu/aqngKdr7cTSy5hiUb3gztZir 7Emlu/eDMpsIyz04GtaDaG7KJUudpepHQFGaKTWbOkMFkkHY5B8zBE6zz6I36568pskf 9rQSJuTvc48NXbhQ/PVg3eZKdw9AFIhd7mZTLp6YGSNXmhhiiJrT5vrkGLe4Snc4u4+r O6SA== X-Gm-Message-State: AO0yUKUuNDFbT313H64KtkymtxpiaS1Epw8ddo8FQfFLkDNR7Z+pXknd aJvX5tdvwQilI1YKRdM2JPgk+cmmMftP6tdA X-Google-Smtp-Source: AK7set+w7qBx8tWVd5e3S/s/PnVDbRDCaVEVteIpNkCsfomGlv2N90tVwNoj1JqC3jxQf+jc/dSwcg== X-Received: by 2002:a05:6e02:1c0d:b0:310:9c6d:e7dd with SMTP id l13-20020a056e021c0d00b003109c6de7ddmr15037462ilh.28.1675636933665; Sun, 05 Feb 2023 14:42:13 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.42.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:42:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 080/169] Correct SPL uses of ENV_VARS_UBOOT_RUNTIME_CONFIG Date: Sun, 5 Feb 2023 15:39:49 -0700 Message-Id: <20230205224118.233425-81-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-sjg@chromium.org> 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 This converts 4 usages of this option to the non-SPL form, since there is no SPL_ENV_VARS_UBOOT_RUNTIME_CONFIG defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) board/xilinx/versal-net/board.c | 2 +- board/xilinx/versal/board.c | 2 +- board/xilinx/zynq/board.c | 2 +- board/xilinx/zynqmp/zynqmp.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c index 5fb71107ddc..7ff2c620110 100644 --- a/board/xilinx/versal-net/board.c +++ b/board/xilinx/versal-net/board.c @@ -172,7 +172,7 @@ int board_late_init(void) return 0; } - if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0; return board_late_init_xilinx(); diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 4cdc2ecd1d2..81e1b69905e 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -142,7 +142,7 @@ int board_late_init(void) return 0; } - if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0; bootmode = versal_get_bootmode(); diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index df4c4576723..9a59445b442 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -55,7 +55,7 @@ int board_late_init(void) return 0; } - if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0; switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) { diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index e3f70c4caf4..39da96bcfb0 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -405,7 +405,7 @@ int board_late_init(void) return 0; } - if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0; ret = set_fdtfile();