From patchwork Mon Feb 6 00:55:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1737975 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=Roe6Qt/T; 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 4P97G03fMsz23r4 for ; Mon, 6 Feb 2023 11:59:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BED6A85B83; Mon, 6 Feb 2023 01:58:17 +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="Roe6Qt/T"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 32E3185C06; Mon, 6 Feb 2023 01:58: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,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-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 0A51085C06 for ; Mon, 6 Feb 2023 01:58:08 +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-io1-xd34.google.com with SMTP id z21so3976041iol.0 for ; Sun, 05 Feb 2023 16:58:07 -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=GSf88OmBVBIt8N6/WmfiQc5mbv4FsI70FPNflNZEfJM=; b=Roe6Qt/T4/buUAGsGVq42wOVYmmHOoTqG7jGJEkBh8u9FHmT7hzSMSKJeAgI3vFqmO QSusDS55NG7eYfnQPRYzDmvxRhV7R9IniW71dLAEfA4Wk59tPxw+szkccyHJ6dhFVs4w 7QW7RBcAZDJUoSUFqbxK4sVXur+v4iF6S4Cak= 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=GSf88OmBVBIt8N6/WmfiQc5mbv4FsI70FPNflNZEfJM=; b=s5hGGsqJc7+iHhjkvphuV8SDo4wgLSfJio+zKRXQMdJXlJyj2EBwKi7SzteP/3HJMV 7/4kc8hdvZrSfXdcyjOTqHAB0g2F4JHeoxCIvEBJaCrTnhrxcVUafLFFnabHxL9k+pYt DhIkj3rSQOahoMYzgpZQn+itGVr/rNYnCEBSwwKNqnj14ZyhIfOP4mMO+O9PPATMElfi EqSADrNeVnBCIi+tz1ohygSl9/xxeCpb6QujswZuY8TYMaBZEXtys1+uR74BJfMo6D7+ 9WstU6KDIBVUqYwkdTVTWtw3/07gpt8Hmh3BPrHDAG/3MnnNrSyIPIqAZ0cgYCTlN7VF /lDA== X-Gm-Message-State: AO0yUKVsKiwORUTDnTwRaUskO7FVpI4ZYNpluxPnptOaPRgvvgl0zFmz E26adkV20+R/YRYij1KpVsXB6K210O4qbTYg X-Google-Smtp-Source: AK7set/RisoVdCL5G/Z25U8CtgBwT6h5maX4yV/scKUT0x6D1RLV1aqNTtdFRQJMJ4s3+sNWhb5+Wg== X-Received: by 2002:a6b:b294:0:b0:704:998f:a6d8 with SMTP id b142-20020a6bb294000000b00704998fa6d8mr10046066iof.4.1675645086576; Sun, 05 Feb 2023 16:58:06 -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 b22-20020a6bb216000000b006e2f42a30c2sm2734703iof.35.2023.02.05.16.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 16:58:06 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 136/169] Correct SPL uses of SAVE_PREV_BL_INITRAMFS_START_ADDR Date: Sun, 5 Feb 2023 17:55:03 -0700 Message-Id: <20230206005537.254541-137-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206005537.254541-27-sjg@chromium.org> References: <20230206005537.254541-27-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 --- (no changes since v1) 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 6026e4367ce..c6c0c1ab1d9 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