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 X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93799C4338F for ; Sun, 1 Aug 2021 19:22:45 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1017860234 for ; Sun, 1 Aug 2021 19:22:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1017860234 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A573A83307; Sun, 1 Aug 2021 21:21:54 +0200 (CEST) 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="GGfjhk8g"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 74EF8832F4; Sun, 1 Aug 2021 21:21:34 +0200 (CEST) Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) (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 61254832EF for ; Sun, 1 Aug 2021 21:21:30 +0200 (CEST) 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-x231.google.com with SMTP id o20so21518012oiw.12 for ; Sun, 01 Aug 2021 12:21:30 -0700 (PDT) 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=HB4zj3Ux5kA0UUDR8/fUnLstYw8l+xb3dP2DgbrTejI=; b=GGfjhk8gA2CyXnRPlTp5W9fpQFbxsQ6f7KYWhCSubDWbFcjOeDMRuMiS+BUzBKlpUE c0rpHCsCzJKo3KUYxWOoRKSIArwoNW+oVS/RRtQZtGmrL0qJBomurbaay/gBtv/htwdy nBlJXOIqDev5SqpYNonSKwrVT7Xkf1XAm3Jpo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HB4zj3Ux5kA0UUDR8/fUnLstYw8l+xb3dP2DgbrTejI=; b=DWJoR01S8T9XfyGJNrsx3Y/pVr6hWNOgWC9VggaO/nTPh1PlZfseJdrYaJ8CQSDL22 SsH7ImWgBav1JRUDuIkgdTXwGFAeIwTSZ5SKWB8FFbF75x90ti5Y+rh7Rp3x2u6ERMzU OkHnh4d44SIM21jjp+4xPh58t66cFQWsa32KwBVlYbXjRDlHb9mBsJjGRLTcDl/4+/Gn AY30/SEPX4IGUWLGwH1NLmLy/HUwvfPkEA7itvWhq8Fdgw4bDwpOhdJHBVRp5f2aADnI cdZEmCqo14MWJYA+bA9YMQdplb1R8RjTioME+DoTYZT/cvhQgXgDQJgvQZHRjX6U5tvr XOfQ== X-Gm-Message-State: AOAM531B+wZzT6gLi+6t3dliGbka+Y7bHgxWOC6bc5obtl3xcyC9bEMx veV8agwmemScBWL8lrFCrRusMQGNkZqTou4o X-Google-Smtp-Source: ABdhPJzcPGMKfTkFzwx8Rn1vBn1nnwQ125dK0QUAQV0PMdOXb0uZ+1Gxv3L9EeRuib9iDvzcixXITQ== X-Received: by 2002:aca:1a02:: with SMTP id a2mr8380229oia.100.1627845688895; Sun, 01 Aug 2021 12:21:28 -0700 (PDT) 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 s16sm1521773otg.51.2021.08.01.12.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 12:21:28 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Masahiro Yamada Subject: [PATCH v4 07/12] Makefile: Simplify devicetree rules for SPL/TPL Date: Sun, 1 Aug 2021 13:21:10 -0600 Message-Id: <20210801132108.v4.7.I8c94b9d5c8a84fab4cae62bea49eb6bdce33c337@changeid> X-Mailer: git-send-email 2.32.0.554.ge1b32706d8-goog In-Reply-To: <20210801192115.2183311-1-sjg@chromium.org> References: <20210801192115.2183311-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 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 1e8c0a26875..b2e23cc479d 100644 --- a/Makefile +++ b/Makefile @@ -1992,9 +1992,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 @@ -2009,8 +2007,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.32.0.554.ge1b32706d8-goog