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 5D896C433F5 for ; Mon, 28 Feb 2022 14:19:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D5C1B83C60; Mon, 28 Feb 2022 15:19:28 +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="W4WTbXzJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2335983CB3; Mon, 28 Feb 2022 15:18:07 +0100 (CET) Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) (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 EB6E283C60 for ; Mon, 28 Feb 2022 15:17:55 +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-x32d.google.com with SMTP id k22-20020a9d4b96000000b005ad5211bd5aso9582680otf.8 for ; Mon, 28 Feb 2022 06:17:55 -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=/r3NaPhcqQwo85CxDnZU4jXLqP7bJdEuvvuiIHOg1W0=; b=W4WTbXzJqqyo/2cDEiAbcZt8y4D5iYNlqZVLHdZ/2BPjrAoHPpiOoShaBrETS1L/Uv fjOpx4Pv/XBt8O5z8iHCp/LQhrAxYMEfRrBi2BydsqibH0SVi7e+UDP2RDq1xdf56G9m V5QxB8cEmCUfOUnIV6JUSEh5g5eDMwEH4yBUI= 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=/r3NaPhcqQwo85CxDnZU4jXLqP7bJdEuvvuiIHOg1W0=; b=7Unw68OV+ltImS8P5MFFDI2/qA+99XyhVTaqO7ewOiYU2D9tFxyKN6wAuRk4YxYukt w1djqCv2jV4kmMm0U3kqHi9T0/Lt4HrgDi/ASSvT6jq2hZOMJvmrJ9OwEvWm+cHA/ddp zxCS51Q8ermNmrDxIYt7+kk4+f18LxV6hhD4j8gXaxwePjJiRPb5KHVXG8ygmYY2p1g5 N6DL2ODxG599Rx4s3IOCyeb473GezKX2J9Bcms2j58ecMlqEsvKRz7BWljwlSJnbafB6 UVMJ06gwE4b6YQAAwJQpTdLB5798pCfNzTjl9/Am0wCspEWoI0pE3DlctM23/VNw7Mis MyUQ== X-Gm-Message-State: AOAM53200Ev9FaJBxIS0RYj9Rm/A9Tx2giKVrOR4Hm/WZz4zs7ZdSddo apGMM6CwTmqrxRmeiPMOybjXVFUlmfuBQg== X-Google-Smtp-Source: ABdhPJwiX76hAuVxANgBknGxCqRsJX6Mkq1UZiGMKZgnn5jl1IO8Ui0H9Un8SL/VFPukkuXTUR1QHg== X-Received: by 2002:a9d:a31:0:b0:5af:244f:266 with SMTP id 46-20020a9d0a31000000b005af244f0266mr9409831otg.252.1646057874161; Mon, 28 Feb 2022 06:17:54 -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 y28-20020a4aea3c000000b0031c0cddfbf9sm4905966ood.20.2022.02.28.06.17.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 06:17:53 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Masahiro Yamada Subject: [PATCH v7 06/15] Makefile: Simplify devicetree rules for SPL/TPL Date: Mon, 28 Feb 2022 07:16:48 -0700 Message-Id: <20220228071651.v7.6.I8c94b9d5c8a84fab4cae62bea49eb6bdce33c337@changeid> X-Mailer: git-send-email 2.35.1.574.g5d30c73bfb-goog In-Reply-To: <20220228141657.1388834-1-sjg@chromium.org> References: <20220228141657.1388834-1-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.5 at phobos.denx.de X-Virus-Status: Clean The current logic checks several options to decide whether SPL/TPL need the U-Boot devicetree to be built. In fact we can check OF_CONTROL, which is enabled in all cases that matter. Signed-off-by: Simon Glass --- (no changes since v1) Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f597bc6866..9d026cc8ac 100644 --- a/Makefile +++ b/Makefile @@ -2087,9 +2087,7 @@ spl/u-boot-spl-dtb.bin: spl/u-boot-spl spl/u-boot-spl-dtb.hex: spl/u-boot-spl @: -spl/u-boot-spl: tools prepare \ - $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SPL_OF_PLATDATA),dts/dt.dtb) \ - $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_TPL_OF_PLATDATA),dts/dt.dtb) +spl/u-boot-spl: tools prepare $(if $(CONFIG_SPL_OF_CONTROL),dts/dt.dtb) $(Q)$(MAKE) obj=spl -f $(srctree)/scripts/Makefile.spl all spl/sunxi-spl.bin: spl/u-boot-spl @@ -2104,8 +2102,7 @@ spl/u-boot-spl.sfp: spl/u-boot-spl spl/boot.bin: spl/u-boot-spl @: -tpl/u-boot-tpl.bin: tools prepare \ - $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SPL_OF_PLATDATA),dts/dt.dtb) +tpl/u-boot-tpl.bin: tools prepare $(if $(CONFIG_TPL_OF_CONTROL),dts/dt.dtb) $(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all $(TPL_SIZE_CHECK) -- 2.35.1.574.g5d30c73bfb-goog