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 3F54DC433EF for ; Fri, 17 Dec 2021 04:04:05 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6DEDC835EA; Fri, 17 Dec 2021 05:02:15 +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="K5Y7la/o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2E09683090; Fri, 17 Dec 2021 05:00:52 +0100 (CET) Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) (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 09E998307B for ; Fri, 17 Dec 2021 05:00:24 +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-oi1-x22f.google.com with SMTP id s139so1778816oie.13 for ; Thu, 16 Dec 2021 20:00:23 -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=Rkbt8HvqpaiNN26aWIRHB5O5yrcT1o/bfQk9sski8rY=; b=K5Y7la/oMzs7HLlpwpLXrCuv3QVKUfLPHg3nZgtinnvOm86wLpndhjV6wpy0uIXvr6 ZHuPbGMO1b/wMtSVc9iTVFC6vTUHYmYUO0ySR4Z2uva/tFRtjZcVthgSJoV9eq7TaTyR s6IYxhRoRjllw29WM/sPgkK/Dlq0cgwkBzKkQ= 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=Rkbt8HvqpaiNN26aWIRHB5O5yrcT1o/bfQk9sski8rY=; b=cTp1Q+d98iD5CYZHY2jTLTudq4ELnJr6Fpx04dEam7B5UVtKzEZ1HC58n+j65MWxcg T1HAvmqRAAO0c476tIz8XRya6tyRF2reZCKFjLSMwGalrZEOVqJHoMqZCqy9g5RBwigZ CyaK7NY0V2zZ+3S9d8Xvx5nX0qBBSXY65Ghy47hlggXWWxSF9Z/tVXPguo0x1ik5KYS4 PJNrYMZF18HeykA8yT2Wjlsd5bzWIS6gGbzk+NoI6GycTYhgDuceyoustrsOoBTDlCOx jpdv+unvjUTV39I08q2ihwdd3HLXfgOzqVofAv68sE4DWfR7TKACJ2SaXYHL66AcAhZP fvIg== X-Gm-Message-State: AOAM530jgdMyLnQzt+h6V6NqLcWUfKQf5gvcApPNRlY93HAeuZ0+LnBU 00ehezzaCFnnYFI5H7uTgoOhKKQpYnOVCQ== X-Google-Smtp-Source: ABdhPJxwkAfVLI4UiLderqZaMP9dup8BOyLUYNJG9l6t487FQPXxj75ZkCD4klZuccdlDV3q0RWbsA== X-Received: by 2002:aca:280d:: with SMTP id 13mr6775390oix.61.1639713622463; Thu, 16 Dec 2021 20:00:22 -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 h14sm1431249ots.22.2021.12.16.20.00.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 20:00:22 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , Sean Anderson , Heinrich Schuchardt , Tom Rini , Mark Kettenis , =?UTF-8?q?Fran=C3=A7ois=20Ozog?= , Simon Glass , Jerry Van Baren Subject: [PATCH v8 22/32] fdt: Drop OF_CONTROL check in fdtdec_setup() Date: Thu, 16 Dec 2021 20:59:29 -0700 Message-Id: <20211217035939.670884-23-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog In-Reply-To: <20211217035939.670884-1-sjg@chromium.org> References: <20211217035939.670884-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 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.2 at phobos.denx.de X-Virus-Status: Clean This function should only be called when OF_CONTROL is enabled. It fails in fdtdec_prepare_fdt() anyway, since gd->fdt_blob stays as NULL if OF_CONTROL is not enabled. Drop this useless check. Signed-off-by: Simon Glass --- (no changes since v1) lib/fdtdec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 659aeffd82e..5b31064cee2 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1624,16 +1624,15 @@ static void setup_multi_dtb_fit(void) int fdtdec_setup(void) { int ret; -#if CONFIG_IS_ENABLED(OF_CONTROL) -# ifdef CONFIG_OF_EMBED +#ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ gd->fdt_blob = dtb_dt_embedded(); -# elif defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE) +#elif defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE) /* Allow the board to override the fdt address. */ gd->fdt_blob = board_fdt_blob_setup(&ret); if (ret) return ret; -# endif +#endif 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, @@ -1642,7 +1641,6 @@ int fdtdec_setup(void) if (CONFIG_IS_ENABLED(MULTI_DTB_FIT)) setup_multi_dtb_fit(); -#endif ret = fdtdec_prepare_fdt(); if (!ret) -- 2.34.1.173.g76aa8bc2d0-goog