Message ID | 20230130151612.212732-119-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=IG7EhqfX; 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 4P5Bs91Qfmz1yhq for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:28:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1AA5585A13; Mon, 30 Jan 2023 16:23:14 +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="IG7EhqfX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 43483859A4; Mon, 30 Jan 2023 16:18:38 +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-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (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 395EE859A0 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:18:31 +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-xd30.google.com with SMTP id o1so762923ioo.10 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:18:31 -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=/d7CEcvrY0CWyNNYrlESVPb9APS5UZgmEnu3KmHM8ks=; b=IG7EhqfX1xx0uWGvzkdkf/GCiiW20rYApfM2nO1fxG0hYkT4cV4l1T068UhzaVnmd+ K5eI+4PQeriRPG3gUno/7lSMXi2vMGCsgM0JMdynnXXHrrc+3pPwTD9B5h+ZTUyKrVgL ocCOPDkDtdt76xDq8BMaMPOktLmiJPpu4DYcw= 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=/d7CEcvrY0CWyNNYrlESVPb9APS5UZgmEnu3KmHM8ks=; b=TbwtqY+Lq10IVXSx+b1d7xY5D2SHKDNBHp5OiJY9zRz/Rmo6kKd1WExbnNNOjv67CJ JEWfYQdmRqF8EeKzR+biMMta1o6FWtE6sL3t+LaRWHTIHVRTDcbWM2YcvSzokoA4CggU l3MD4zCc+SXamVicbKY7mrpN08nbfOIwmJFPAN8B82CdZiheyLvEZCWiU+USJdy2bajJ gCfJuuxvw9RSPBPbx5xI2XtBFFEuLixpWjr9VBiBeyJQzcLtYZ4cN2Hzc0EYWFTcZEFr bXX+YNE9LElq5QOlRXhlOMnL+t9uqXXLwklu0hzgYz6+hMcqdUI8F5p/scZc2/yQ23Wj T2sg== X-Gm-Message-State: AFqh2kpVtIBsJGxOIX6BtyGrlGlb0HihZLbkk0ol1J+QiNDoGMP5HQ9I bsAEpsCtZKd0ema9LSR8Q0uP78ASsT3lEpcf X-Google-Smtp-Source: AMrXdXuoEcDNvl+kRf/jx+qlHe18Nalzne1mzciLdh+6Mfkruu3fp0OVG8IqaRmF4VGpBdtgWuxxXQ== X-Received: by 2002:a5d:9f0c:0:b0:6e2:d23a:6296 with SMTP id q12-20020a5d9f0c000000b006e2d23a6296mr32740981iot.20.1675091842086; Mon, 30 Jan 2023 07:17:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:21 -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>, AKASHI Takahiro <takahiro.akashi@linaro.org>, Dzmitry Sankouski <dsankouski@gmail.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Marek Vasut <marex@denx.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 118/171] Correct SPL use of OF_EMBED Date: Mon, 30 Jan 2023 08:15:19 -0700 Message-Id: <20230130151612.212732-119-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 cbc140e6d8b..2cd66eac803 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) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) + if (IS_ENABLED(CONFIG_OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) gd->fdt_blob += gd->reloc_off; #ifdef CONFIG_EFI_LOADER
This converts 1 usage of this option to the non-SPL form, since there is no SPL_OF_EMBED defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- common/board_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)