Message ID | 20211207001209.3467163-24-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=W+goFSLL; dkim-atps=neutral Authentication-Results: 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>) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7LTn210Sz9sCD for <incoming@patchwork.ozlabs.org>; Tue, 7 Dec 2021 11:17:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 398778366F; Tue, 7 Dec 2021 01:14:43 +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="W+goFSLL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 31388830B3; Tue, 7 Dec 2021 01:13: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.7 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-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) (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 3E656830EA for <u-boot@lists.denx.de>; Tue, 7 Dec 2021 01:13:11 +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-x234.google.com with SMTP id bf8so24588057oib.6 for <u-boot@lists.denx.de>; Mon, 06 Dec 2021 16:13:11 -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=Caa0agWU3ZvxsQ8iTdgX0MeTQHflmUNQFpzeQWiEj2Y=; b=W+goFSLL3aWmhPydgGlsKczCz4u45TZueJp5S5BfG3vpvKz9MeDcDU9vz8XkfDBx8W Gvxb2bxdYGqbiN/bSlrlQSLyfQdjiWXvlAAsbiyuAbTqwThB3M/Ilkg0lySGpnnTBf+b XlGkyEOe45NsdWSWNqTph4Dy33BqNixrq4j3k= 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=Caa0agWU3ZvxsQ8iTdgX0MeTQHflmUNQFpzeQWiEj2Y=; b=nmERPmGeW2wGztRJ5fNMBTkpFBfMuvoFBd3rSUAoB55N2i2UBcMeXdW3n1K6YIKcyM VoF6FsX1joiz4MlqFWwxohABe+J1aLTZ4K+wEzJMXmOrWqJizj9qFgjGbsxHdg2OE4gq LIFz2469UBciih4i1Vw1iSqMNXRa+EYwThjOXjIKbTo4CLpmigpFSS8e0mu+OfkC5hAr yHX2/bryVBk8Pj5PIYr0Mdc8VfMPcB+6YttdzzD6ZAzEemALAPdsZSL9kmBC/S6a4k+s 1/55wkq7PJfbnYF9DYiXt7iHoQaD9UFcr0606nvMBgK9mMHUsYUB6LFr47wbwi/vmMqY WzGg== X-Gm-Message-State: AOAM532gztuaEIIyc0ItwVH5MjwpN5t9rXkh0RCtVtwtMLxJkLO0eT8f OXmnWowVKJhq1Yqu9fZe2py0joux3qjujg== X-Google-Smtp-Source: ABdhPJx7aUk9e6DiJITNTJuVKS01sNeAvZrzjszgkBPXwTY5aveVzIQg9grqhK7e3FkJafwTIepK4g== X-Received: by 2002:a05:6808:1a28:: with SMTP id bk40mr2059763oib.26.1638835989687; Mon, 06 Dec 2021 16:13:09 -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 g7sm2466410oon.27.2021.12.06.16.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 16:13:09 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Sean Anderson <seanga2@gmail.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Mark Kettenis <mark.kettenis@xs4all.nl>, Tom Rini <trini@konsulko.com>, =?utf-8?q?Fran=C3=A7ois_Ozog?= <francois.ozog@linaro.org>, Ilias Apalodimas <ilias.apalodimas@linaro.org>, Simon Glass <sjg@chromium.org>, Jerry Van Baren <vanbaren@cideas.com> Subject: [PATCH v7 23/31] fdt: Drop OF_CONTROL check in fdtdec_setup() Date: Mon, 6 Dec 2021 17:12:01 -0700 Message-Id: <20211207001209.3467163-24-sjg@chromium.org> X-Mailer: git-send-email 2.34.1.400.ga245620fadb-goog In-Reply-To: <20211207001209.3467163-1-sjg@chromium.org> References: <20211207001209.3467163-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 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)
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 <sjg@chromium.org> --- (no changes since v1) lib/fdtdec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)