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 67D8BC54EED for ; Mon, 30 Jan 2023 15:14:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3FCFD857A3; Mon, 30 Jan 2023 16:14:28 +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="ljCE0WDy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B30118585B; Mon, 30 Jan 2023 15:58:57 +0100 (CET) Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 D052185843 for ; Mon, 30 Jan 2023 15:58:48 +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-x12c.google.com with SMTP id u8so5181790ilq.13 for ; Mon, 30 Jan 2023 06:58:48 -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=kjf8ETq0eZ7kHnT9whesOSVfnD04IhqNyYRcrVE7jmc=; b=ljCE0WDyCdIEFnK25p9SaRLVcxe0eTu7M5m04A8MaASJD9U45vKvgfA7FRGw+6sNkQ IoXjUcuSw+JzWakMMH9DCPDH/PbIkAaqfD/LegGzioOFV7sYjxP+tE5In634BPfjX0pS Iy3OKiRqhfG1g4xRHF7GoKlxplEN/1GRo3ki8= 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=kjf8ETq0eZ7kHnT9whesOSVfnD04IhqNyYRcrVE7jmc=; b=i8wBae/MURXrjaq4PZnAvhOuk+liRcPZUGM30cch2D/eceBdfUeiDQqX+RETFYuGF8 aXsJelcAQVs108RqCEwbZ6hoFTFycoIwbkLaRqUn6ei2hdmgP53LDMJCKVTfA4u5ZGE+ LkGz8oOJhVzaSTJJz5wjTmYhdJcDAkxPqvtTRwj5EMUoGR6v29RY+d1nWzmzYg7vvoun hvpg6cy21KGAtm9UqtZ0Ujh65DgpRpaP4+OnW85yi83F4pC+yhjk7Biinno+32jAhOZL B4Z03c6kGTmI2sbTmIwu6h0io/sU35xjDbUAQSQBG3lSGy/pWt7caGipmNNhY806ujKY d45Q== X-Gm-Message-State: AO0yUKUJI6y3vl1HnincVGtL8I91r10vwteGGwOeP+rLZdlWMtLNirvg wnLt7rmFPPEgU72NWrghyIzykZp3kmg1KK1n X-Google-Smtp-Source: AK7set8cG72WzawCWvOi1yNqOUXRargkw7gzZylaC+HWaYQYXG4+Fk37S8l0VizS1l/ssCZR1YYKoQ== X-Received: by 2002:a05:6e02:1c21:b0:310:eb06:cccf with SMTP id m1-20020a056e021c2100b00310eb06cccfmr4333242ilh.8.1675090701891; Mon, 30 Jan 2023 06:58:21 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:21 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Michal Simek Subject: [PATCH 082/171] Correct SPL uses of ENV_VARS_UBOOT_RUNTIME_CONFIG Date: Mon, 30 Jan 2023 07:41:55 -0700 Message-Id: <20230130144324.206208-83-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> 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 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 --- 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(); -- 2.39.1.456.gfc5497dd1b-goog