Message ID | 20230130151612.212732-113-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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=I6Awrhjm; 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 4P5C6b56CNz23hS for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:39:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D3B3585AA3; Mon, 30 Jan 2023 16:27:37 +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="I6Awrhjm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 315DA857F7; Mon, 30 Jan 2023 16:25:40 +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-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (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 3BC6185971 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:17:41 +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-x130.google.com with SMTP id d10so5207467ilc.12 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:17:41 -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=xV9U0arjBIERdheETx+XAjsyPhZH7vrKSwaXco2pnlQ=; b=I6Awrhjm2t/vtciEbYjgFAYX1Cul1BwWFhwKTFN8oFa82ZOjhZMpljaPi6rCWzYRj+ Ey+tfJpcV9uxa8hOpDVQQRRyJQ6IjoqgN+69x2Apkp1WA7PHjkrB3+FtuzKkEpbX13bj vy2MZJn0eDQE4w+NCJbwFV9bY78rls3EOt+3Y= 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=xV9U0arjBIERdheETx+XAjsyPhZH7vrKSwaXco2pnlQ=; b=fzMP3zUKBmbdfa6yq+7C0WXjIAlFsSHrkIi/EnlwF55rC3qmzmJTs5KCxbJSk416SL puPk57iBRi0fr0a9q8DTv5f7O+/wJn+qbGZEn96Vv7qopebMS5iR1gZFDIrOx40OZtnr MgVIbTzp09dqlFvTf7TtLZchdwm3TydajMuAhdYCw2bOJRrJo0q4n3wSBZ6BYWiwdkk1 hbIJuWjasbFNezBPfw+EhrnqikcAR0i92D1BG7BZrG3IobpYbNTuxPqvfc6QyAIx69fm ydDTt5TyhtZG3C8Yd/sKuo5eR6XuhFKWyG/tzDbF5UN3lV+qYypJzCpcYxIX7tMqNwWs mRtw== X-Gm-Message-State: AO0yUKXTFHqMDq9RsgLWEhOKp0m9ggGgXQB2jqfhQgqCC7fCvzmbazsM D8SclYsvuhHCOpz6Umk+KeobHYrndsSECWuZ X-Google-Smtp-Source: AK7set8rYAIvIJ0dTJgX8DJED4pE07GcrfWZg2RnhOlet4WzuKwHymwTvFgRRlYypOkWin4p7tqNkQ== X-Received: by 2002:a05:6e02:1c25:b0:310:a5a4:73cb with SMTP id m5-20020a056e021c2500b00310a5a473cbmr16599112ilh.29.1675091837153; Mon, 30 Jan 2023 07:17:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:16 -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>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Ovidiu Panait <ovpanait@gmail.com>, Rasmus Villemoes <rasmus.villemoes@prevas.dk>, Stefan Roese <sr@denx.de>, Sughosh Ganu <sughosh.ganu@linaro.org> Subject: [PATCH 112/171] Correct SPL uses of NEEDS_MANUAL_RELOC Date: Mon, 30 Jan 2023 08:15:13 -0700 Message-Id: <20230130151612.212732-113-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/common/board_r.c b/common/board_r.c index 552b9899323..cbc140e6d8b 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -155,7 +155,7 @@ static int initr_reloc_global_data(void) * The fdt_blob needs to be moved to new relocation address * incase of FDT blob is embedded with in image */ - if (CONFIG_IS_ENABLED(OF_EMBED) && CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC)) + if (CONFIG_IS_ENABLED(OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) gd->fdt_blob += gd->reloc_off; #ifdef CONFIG_EFI_LOADER @@ -609,7 +609,7 @@ static init_fnc_t init_sequence_r[] = { */ #endif initr_reloc_global_data, -#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT) +#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT) event_manual_reloc, #endif #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) diff --git a/common/event.c b/common/event.c index c312556490e..164c95f8f52 100644 --- a/common/event.c +++ b/common/event.c @@ -155,7 +155,7 @@ void event_show_spy_list(void) } } -#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) +#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) int event_manual_reloc(void) { struct evspy_info *spy, *end;
This converts 3 usages of this option to the non-SPL form, since there is no SPL_NEEDS_MANUAL_RELOC defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- common/board_r.c | 4 ++-- common/event.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)