From patchwork Sun Sep 19 23:48:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1529906 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: 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=TVU1yxKF; 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=) 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 ozlabs.org (Postfix) with ESMTPS id 4HCPYX2p1Rz9sSs for ; Mon, 20 Sep 2021 09:49:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C282783260; Mon, 20 Sep 2021 01:49:10 +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="TVU1yxKF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E35383223; Mon, 20 Sep 2021 01:48:39 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-3.6 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-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (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 C7C6A83267 for ; Mon, 20 Sep 2021 01:48:31 +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-il1-x132.google.com with SMTP id b15so16677257ils.10 for ; Sun, 19 Sep 2021 16:48:31 -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=qRnSINtHrEBZiF1HzWPHYJCDumvrjZX5T6ODCiVlu2U=; b=TVU1yxKFnBO3ijZ/REKE6PzMY6bzpc/mTsXLSsJhcWBb5p5y8ah9/pQrB7ulfGzYRx kbYsVcggCf0mB/m3o6X/foDquEzmviCvCollstBZwuh3HgADcArAkkTSGxnya4SKpkd1 of1zOuVGgSh+LQBst1m6Tbp7gcKF1Yw2cGv3o= 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=qRnSINtHrEBZiF1HzWPHYJCDumvrjZX5T6ODCiVlu2U=; b=qteir3KOm9RrutJidU0tSu5d2iLCQz+r9162AZlTcmNIt2mBnEJ0NMeHdHwS9XZMc3 1puWV9uMsglItl/Ei5v811HTwYIyLlk1F986vePPqa7h6OA93xhQvy0LNu2RsYjNy+w7 ymHO2znkp8BK3VKVHYanaesQxhZgSPrHUV4s5T/nqoCIcPpYYuSs0axAFnSMM5eDEwU6 hAggCo7VWub5A+kiDl13I4KllX+XlTnXl6sYJ+feDNdrsfTAQ3EEMFdi24fzDfBc2o5s f/AD1+F878CPRgN+zAVbOw0tJcMHFy7EyzXh6eHwMWI6olThZzC4SbzE+AKhbMpMNa04 SFXw== X-Gm-Message-State: AOAM530ihnRKZ4oaZiY6NUDLttK5ruYEHWvh6FzTSx7XgbjyJ0xhTLys sm5FWnJg3BUymngCDnQXN3TEfRrh4QL2dg== X-Google-Smtp-Source: ABdhPJx0aKImHxibTktIYtEZQuwZ5kWYgbT6AFhm6Y6T0Xd+5XVKYczciB1DAIafUH2YnT2LkNWtLw== X-Received: by 2002:a92:cb49:: with SMTP id f9mr15615959ilq.119.1632095310282; Sun, 19 Sep 2021 16:48:30 -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 y6sm7854441ilv.71.2021.09.19.16.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Sep 2021 16:48:29 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Masahiro Yamada Subject: [PATCH v6 06/11] Makefile: Simplify devicetree rules for SPL/TPL Date: Sun, 19 Sep 2021 17:48:15 -0600 Message-Id: <20210919174815.v6.6.I8c94b9d5c8a84fab4cae62bea49eb6bdce33c337@changeid> X-Mailer: git-send-email 2.33.0.464.g1972c5931b-goog In-Reply-To: <20210919234820.3840570-1-sjg@chromium.org> References: <20210919234820.3840570-1-sjg@chromium.org> MIME-Version: 1.0 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 6837487911a..ff5b9c3a68e 100644 --- a/Makefile +++ b/Makefile @@ -1995,9 +1995,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 @@ -2012,8 +2010,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)