From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B8F12C636CD for ; Sun, 5 Feb 2023 23:08:38 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2EAEA85A65; Mon, 6 Feb 2023 00:02:22 +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="a3y9VF5P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1CB0585B49; Sun, 5 Feb 2023 23:52:46 +0100 (CET) Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) (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 5CAC785AD9 for ; Sun, 5 Feb 2023 23:43:16 +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-xd35.google.com with SMTP id j4so3886753iog.8 for ; Sun, 05 Feb 2023 14:43:16 -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=eosI91LsnsYXLZRWFZGO4p6ZMYqOmL92yA3RA2HAz+w=; b=a3y9VF5Pwt4Xl7O74LM7Q9NoolzFwxyqeLrWIAhdSWjaHHJN4MvGMZRNTTJQL5M7SX 9Jf9km3QKZf/OeqkJIJHQr1uQhCha5UpA4TmSzXwJOk3L3VBSCAqBRUr1VtmpHF/7xe/ 8tlhVGUmuezuIYEDN8aCTOeU+1RmMKLqxmDIU= 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=eosI91LsnsYXLZRWFZGO4p6ZMYqOmL92yA3RA2HAz+w=; b=fMjTUhJv8VGEiuj9I0VdZNe6qMT1j6Z+DlXu8gBLrg+5G8+n/pTzV0pGj64grFubKL APgVIBN6aD5+SGmnWvjJKYNutywA2swcC8SEjSVeIow5v24yMeHJI94TFa0wVlAv82on F83aLhLWKqOFt1ePDSQ4MBhvwpb0J4pn129PcNl0NQdgJdKKyukE4Ra90+uS3HYDvUPx AuWB0GAc3Oql+pnaspaXtYkbBb6xvWQAp2kuTe/sI7PaxImuToMoyoY0NGD8zj0q8rfN ctXckxUn1SlhoL1Pwkqt+UsvN+Otoy05hgEU6UlyzfAerrjmtZCoUv4eTm8i42491b+Y Nt9A== X-Gm-Message-State: AO0yUKXaiI0KDKFNDlyxflBgLeRQsDg3XV5nhNg/sFDkzDiU+vr/a2DQ P6xlkk3h6LB9VRyz72Xf9Z83Ehoe44BIKkK5 X-Google-Smtp-Source: AK7set/v2daooMPzqx++aajq+7AttEmbkoJ5qh7/zaXXsPwo2rPbhApiIyNgBiMETlpkcLV6TVbNSw== X-Received: by 2002:a05:6602:2350:b0:6bc:d714:520f with SMTP id r16-20020a056602235000b006bcd714520fmr14132770iot.15.1675636989774; Sun, 05 Feb 2023 14:43:09 -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 z22-20020a05663803b600b003b33e77e5b2sm1503513jap.110.2023.02.05.14.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:43:09 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 116/169] Correct SPL use of OF_EMBED Date: Sun, 5 Feb 2023 15:40:25 -0700 Message-Id: <20230205224118.233425-117-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205224118.233425-63-sjg@chromium.org> References: <20230205224118.233425-63-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 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 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 --- (no changes since v1) common/board_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_r.c b/common/board_r.c index fe803615163..90e1219fb96 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 -- 2.39.1.519.gcb327c4b5f-goog