From patchwork Mon Jan 30 15:15:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734244 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=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=lpWDf1Nc; 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 4P5C801nqvz1yhq for ; Tue, 31 Jan 2023 02:41:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1197585AC0; Mon, 30 Jan 2023 16:27:55 +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="lpWDf1Nc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 11AF8859EE; Mon, 30 Jan 2023 16:25:48 +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=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) (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 36546859C1 for ; Mon, 30 Jan 2023 16:19:03 +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-x133.google.com with SMTP id h18so2450544ilj.6 for ; Mon, 30 Jan 2023 07:19:02 -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=KuASlOTpt21F7/eXfM4sLubsneFv/t4BVrwr4fZ7boY=; b=lpWDf1Ncp85OVkbu86V6ny9nBYpNmRgfEaef9hLww9q51ngI4Fb4vc+f8kW8TSzCLs jKbQtekVV/p9U3Y0hgh7GITrw0g2KcqsDlV6LOwG4min5oLxgMP98RvM0ibCk0eQcFiW L6yqNYUHB9X6T7ue6mWwUqOO74jwdNWyxaUF4= 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=KuASlOTpt21F7/eXfM4sLubsneFv/t4BVrwr4fZ7boY=; b=DE+vI/L1hhK5nzWrem4LdXh073x451ywhl/pvUXQD6BKyo5hb3Y56mm/iqWaDGgnqs 6k/ps71zr71AfMcXLCnF6fLlblBVzh6ItJw3PqkEQaI+XtacPIpdRQ4jCXZg7k/z0z1a FGhHw2W/hDHhFy7O98bsosROmIMlTAf2oe7tTsH+8ZS2u+pNdwiVpmM/25pHxCyFPAxR d4Xac1jVsqEZQlQ/e4ebtF7bCl/meFleXQzElpv2BKIgE6mODcC17OBrMEnnYhJtaq3B RQOBMOzG7bCtHvrHlLqcgzbiGqjJXtyktvOgpcrV1SKX2OMweY88+jpWfqFlJ4QZM0cD fCOw== X-Gm-Message-State: AO0yUKWjh5qUA8XVtZojJfKB1RnIQ09pwGMify/Q4XTVWwwnJgHp0TNj dhMNONi3+yGriwNS2bMNheROaoNo32qc1Cq4 X-Google-Smtp-Source: AK7set+aKOxxZjHpdCgo5ESaNZ8IOaCGJjk95IKx5RUCecxX53wveD+8nzMtSM/Oj1Znk6DJKaRUMQ== X-Received: by 2002:a05:6e02:1a0d:b0:311:7e6:f59 with SMTP id s13-20020a056e021a0d00b0031107e60f59mr274764ild.1.1675091870966; Mon, 30 Jan 2023 07:17:50 -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 o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:50 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , AKASHI Takahiro , Dzmitry Sankouski , Heinrich Schuchardt , Ilias Apalodimas , Marek Vasut , Ovidiu Panait , Rasmus Villemoes , Stefan Roese Subject: [PATCH 138/171] Correct SPL uses of SAVE_PREV_BL_INITRAMFS_START_ADDR Date: Mon, 30 Jan 2023 08:15:39 -0700 Message-Id: <20230130151612.212732-139-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-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 2 usages of this option to the non-SPL form, since there is no SPL_SAVE_PREV_BL_INITRAMFS_START_ADDR defined in Kconfig Signed-off-by: Simon Glass --- arch/arm/lib/save_prev_bl_data.c | 2 +- common/board_r.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c index cd943eefe10..f7b23faf0d6 100644 --- a/arch/arm/lib/save_prev_bl_data.c +++ b/arch/arm/lib/save_prev_bl_data.c @@ -62,7 +62,7 @@ int save_prev_bl_data(void) if (IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) env_set_addr("prevbl_fdt_addr", (void *)reg0); - if (!CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR)) + if (!IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR)) return 0; node = fdt_path_offset(fdt_blob, "/chosen"); diff --git a/common/board_r.c b/common/board_r.c index 56c50f43baf..df88a9dd63b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -452,7 +452,7 @@ static int initr_env(void) env_set_hex("fdtcontroladdr", (unsigned long)map_to_sysmem(gd->fdt_blob)); - #if (CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR) || \ + #if (IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR) || \ IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) save_prev_bl_data(); #endif