Message ID | 20211202155919.2429190-23-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@bilbo.ozlabs.org Authentication-Results: bilbo.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=oNHr5oV3; dkim-atps=neutral Authentication-Results: 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>) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J4gjq06WZz9s1l for <incoming@patchwork.ozlabs.org>; Fri, 3 Dec 2021 03:03:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9958083779; Thu, 2 Dec 2021 17:02:29 +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="oNHr5oV3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3EDAC83759; Thu, 2 Dec 2021 17:01:30 +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.8 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-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) (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 19C2F834E4 for <u-boot@lists.denx.de>; Thu, 2 Dec 2021 17:00:32 +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-ot1-x32c.google.com with SMTP id w6-20020a9d77c6000000b0055e804fa524so251124otl.3 for <u-boot@lists.denx.de>; Thu, 02 Dec 2021 08:00:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=06XuDJbTuoW9y4h2vx8t/9jXyx5xvoEhdKic/iraV3g=; b=oNHr5oV32fH6/9yO/seD3ICBcXJOOPYtxAhIsCHrzzA0K2SrWIywHF0/+15d10AmXV vX0JXIuJCEgs78mw3N/ld3St6rBk5Tg8BREVQAjAX5w0aX9xkv++JTqEQce+53cxj0JF xm342GyWYfWhinPbb7uIIykaWB/4bkZjlcGk4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=06XuDJbTuoW9y4h2vx8t/9jXyx5xvoEhdKic/iraV3g=; b=sejzdn7313AePOJUIIYbg9VmDL/YhyBmylLqDrN+MEucv2qsMUZzolnLj2EbfqpQIX 4jkVpidKPokn4grVjbQfNXXM3wQR1/+XQmay791pxNxCFnuwpdB9+y9vmcNUuKufQIqW ZqcMLyu2vOenX0Tl7Q9eQB3W0fG2II6OWTHRuQ5x0zFStlDAAGAt4PwymGxVrIL0yGBh N0QV88FBuTmH5zy2Fj4RbUY1HfM6y27kcaAc8iaEd5WcldQG/UkzpH5Peclc2RxGlbIK kizxUtL6Q8ZXY9zqiPJ4c/m+jlCyD1ptbafofLG7d2w1CCyRakVZ9Gb1kwgq7eQVUU8N z6Dw== X-Gm-Message-State: AOAM531JPeBWik2+V+K1WlfunJ5msSyswtzp+sdxeM8w16RX0qpPxgEW xxAnOY9FOpka4TrQl5WoWh/6TTl5R4iplQ== X-Google-Smtp-Source: ABdhPJwq85CP2WBTCvaih4mXpCxIB8/X+nxGYuBJyjcL5MeOWWjve6m9gbs2emPpa7dbE7goBFCpIw== X-Received: by 2002:a05:6830:2b25:: with SMTP id l37mr11853208otv.298.1638460830257; Thu, 02 Dec 2021 08:00:30 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id r22sm103459oij.36.2021.12.02.08.00.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 08:00:29 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Mark Kettenis <mark.kettenis@xs4all.nl>, Sean Anderson <seanga2@gmail.com>, Ilias Apalodimas <ilias.apalodimas@linaro.org>, Tom Rini <trini@konsulko.com>, =?utf-8?q?Fran=C3=A7ois_Ozog?= <francois.ozog@linaro.org>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <sjg@chromium.org>, Jerry Van Baren <vanbaren@cideas.com> Subject: [PATCH v6 22/25] fdt: Use if() for fdtcontroladdr check Date: Thu, 2 Dec 2021 08:59:16 -0700 Message-Id: <20211202155919.2429190-23-sjg@chromium.org> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog In-Reply-To: <20211202155919.2429190-1-sjg@chromium.org> References: <20211202155919.2429190-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
fdt: Make OF_BOARD a boolean option
|
expand
|
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 299a2c3a32f..659aeffd82e 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1634,12 +1634,11 @@ int fdtdec_setup(void) if (ret) return ret; # endif -# ifndef CONFIG_SPL_BUILD - /* Allow the early environment to override the fdt address */ - gd->fdt_blob = map_sysmem - (env_get_ulong("fdtcontroladdr", 16, + if (!IS_ENABLED(CONFIG_SPL_BUILD)) { + /* Allow the early environment to override the fdt address */ + gd->fdt_blob = map_sysmem(env_get_ulong("fdtcontroladdr", 16, (unsigned long)map_to_sysmem(gd->fdt_blob)), 0); -# endif + } if (CONFIG_IS_ENABLED(MULTI_DTB_FIT)) setup_multi_dtb_fit();
Change this to use if() instead of #if Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) lib/fdtdec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)