Message ID | 20230130151612.212732-138-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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=d/s7HfKH; 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 4P5C7n3kbgz1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:40:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B951585AAC; Mon, 30 Jan 2023 16:27: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=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="d/s7HfKH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C139885978; Mon, 30 Jan 2023 16:25:47 +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-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 D4113859BB for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:19:02 +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-xd2a.google.com with SMTP id l128so588713iof.2 for <u-boot@lists.denx.de>; 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=U0iesaMotnT30YwjjpCkOfMStQAxKFhZFC0cN+SVJEw=; b=d/s7HfKHXDDSQOI8M1Mn7RJ09IazuEd5VmOPR8uSeq9Kh4uZlabxdCju/9FviOTmdB EZx0kuo5NLEvv1c8sWegYXXD7i8/IpOLkfBNMRqSYDGScISH+ZiVW/Dl8KbPz7Gk7zPZ 4+MmOcAkfXqVuyiv8jG4Lvf2GWPxRarOg+YnE= 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=U0iesaMotnT30YwjjpCkOfMStQAxKFhZFC0cN+SVJEw=; b=SEmYe0oDsUUiEyUnlt/oLpwtfSmpbqdvGbAI/n4ATsaE2lqcqqxaM8rDbPemItu9Qc enUsqxisEQhtlokERUpmbJ/bXkquo7YrO2yq4iHx6NcLouXakLLGtEL5F1iI875i7Jiw cQNiZ1DHvfWZnN/wSZ/O0Kxww7BJ3Yt0qR09voQw6/+FVd4czzjTRNdlHQsCurkH8exI scYgTPl102u+HoI0TFO2SvptM7t4XRJ33CV06tMwFWPiFMs5aYeQ9zu//RBQsY0heGYD p6bYy01AjuNaqbG+QDL+OiKqz/qvH1ARbJJjWhJCxQxYQ+tEEh7nRRG9L5CdlyWQ8vhG qSJg== X-Gm-Message-State: AO0yUKWAmTAE2sIog7toFkEwap1X680AD846jVd0PoaIVjZ43NJpkpOB QHxrAmhKXNt10t6FUvz0QDX/HQ1zu5TIgzSs X-Google-Smtp-Source: AK7set9AcSI1/1MP+yrMLs64CpjwNAdNDqrLt/lY4lpz++WTqMOSmBvX1+jCNk032rSwQOQi+mia8g== X-Received: by 2002:a5e:8b03:0:b0:715:a675:d449 with SMTP id g3-20020a5e8b03000000b00715a675d449mr6437104iok.6.1675091870041; 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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:49 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Dzmitry Sankouski <dsankouski@gmail.com>, Ilias Apalodimas <ilias.apalodimas@linaro.org>, Marek Vasut <marex@denx.de>, Ovidiu Panait <ovpanait@gmail.com>, Rasmus Villemoes <rasmus.villemoes@prevas.dk>, Stefan Roese <sr@denx.de> Subject: [PATCH 137/171] Correct SPL uses of SAVE_PREV_BL_FDT_ADDR Date: Mon, 30 Jan 2023 08:15:38 -0700 Message-Id: <20230130151612.212732-138-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 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
None
|
expand
|
diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c index f4ee86a89c6..cd943eefe10 100644 --- a/arch/arm/lib/save_prev_bl_data.c +++ b/arch/arm/lib/save_prev_bl_data.c @@ -60,7 +60,7 @@ int save_prev_bl_data(void) return -ENODATA; } - if (CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR)) + 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)) return 0; diff --git a/common/board_r.c b/common/board_r.c index 2cd66eac803..56c50f43baf 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -453,7 +453,7 @@ static int initr_env(void) (unsigned long)map_to_sysmem(gd->fdt_blob)); #if (CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR) || \ - CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR)) + IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) save_prev_bl_data(); #endif
This converts 2 usages of this option to the non-SPL form, since there is no SPL_SAVE_PREV_BL_FDT_ADDR defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/lib/save_prev_bl_data.c | 2 +- common/board_r.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)