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, URIBL_BLOCKED,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 C40D1C4338F for ; Sat, 7 Aug 2021 13:26:18 +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 E06B061058 for ; Sat, 7 Aug 2021 13:26:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E06B061058 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 6C3BC83201; Sat, 7 Aug 2021 15:25:22 +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="BG7tyKDB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 584D582C4D; Sat, 7 Aug 2021 15:24:48 +0200 (CEST) Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) (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 75C8782E4C for ; Sat, 7 Aug 2021 15:24:26 +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-ot1-x334.google.com with SMTP id d10-20020a9d4f0a0000b02904f51c5004e3so7942454otl.9 for ; Sat, 07 Aug 2021 06:24:26 -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=R/wK5O5Q9w+0l7nnlfEyGxCs12urMZmLC0csl+zdSbc=; b=BG7tyKDBKmRGa/YVkeFOxvmvooeSRmOLlr1Bi6A6WmenzuJkoJEcndDX49jrhZ9QN4 k1ROe5sc8JA3VQmpbvssjxYxDZCaZtqrAwsS/aejTu1QSGN29Ytivl97nCfDU5bKb3M5 /Z+nOV6PI7muIRnJ4K/PR4rSSCgKKIl7EjhEY= 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=R/wK5O5Q9w+0l7nnlfEyGxCs12urMZmLC0csl+zdSbc=; b=kW27tiaxr65U4eY5oQHYWvMGYM7uXZz6V+Xei6Sw243SScpHo49H+ba/VExW++ETsN NTzzwHOPMXikHx0bFKxXCCz9j5xovi7tqjnmurqdtnaYUbZ/TGyBUZWLot9iRImLmNMS 9nhTMuRMYwg/uF9p2JHL5bKiDmIEwoa8rp3iZitom5rO/OIIfF37fMHQIu35Q+jIJ/Pc u3//Ds/tnsEPQza1dFrWL0OF8bAUH31raWs+GKgZkX6lylcq88V1hyxIjJUwHZWhgS/w mXoL3je9BAHXAaTVOgOry3xcu1iztJTZdyxcmmT/iWPfha1jpSasA4M0Op9edD1cCF4D W/ew== X-Gm-Message-State: AOAM530sK7rzF0yviMbIgwfHmAqb7FgxfbxjIX25MyTshID+aSzKj3Vz P+fu/wIkCQFWBJtyE3TPI9W0grsMBkxN6JZ/ X-Google-Smtp-Source: ABdhPJywHm63QC/NRLTaAPDFqoJ0lYcJ4nncbUl57RIxuiPo0/i5KoSJh+si40mTmvKpzEpMcxjzUQ== X-Received: by 2002:a9d:7b4e:: with SMTP id f14mr11121464oto.348.1628342664854; Sat, 07 Aug 2021 06:24:24 -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 x16sm1866417ooj.1.2021.08.07.06.24.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Aug 2021 06:24:24 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jerry Van Baren Subject: [PATCH 07/12] fdt: Update Makefile rules with the new OF_REAL Kconfig Date: Sat, 7 Aug 2021 07:24:07 -0600 Message-Id: <20210807132413.3513724-8-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.605.g8dce9f2422-goog In-Reply-To: <20210807132413.3513724-1-sjg@chromium.org> References: <20210807132413.3513724-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 Simplify some of the Makefile rules using this Kconfig. Signed-off-by: Simon Glass --- Makefile | 7 ++----- lib/Makefile | 5 +---- scripts/Makefile.spl | 9 +++------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 269e353a28a..378eaccbc12 100644 --- a/Makefile +++ b/Makefile @@ -1304,10 +1304,6 @@ u-boot.ldr: u-boot # Use 'make BINMAN_VERBOSE=3' to set vebosity level default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE)) -# Tell binman whether we have a devicetree for SPL and TPL -have_spl_dt := $(if $(CONFIG_SPL_OF_PLATDATA),,$(CONFIG_SPL_OF_CONTROL)) -have_tpl_dt := $(if $(CONFIG_TPL_OF_PLATDATA),,$(CONFIG_TPL_OF_CONTROL)) - quiet_cmd_binman = BINMAN $@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ --toolpath $(objtree)/tools \ @@ -1321,7 +1317,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ -a scp-path=$(SCP) \ -a spl-bss-pad=$(if $(CONFIG_SPL_SEPARATE_BSS),,1) \ -a tpl-bss-pad=$(if $(CONFIG_TPL_SEPARATE_BSS),,1) \ - -a spl-dtb=$(have_spl_dt) -a tpl-dtb=$(have_tpl_dt) \ + -a spl-dtb=$(CONFIG_SPL_OF_REAL) \ + -a tpl-dtb=$(CONFIG_SPL_OF_REAL) \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex diff --git a/lib/Makefile b/lib/Makefile index 07c2ccd7cfd..ecb32ae1057 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -79,10 +79,7 @@ obj-$(CONFIG_$(SPL_)LIB_RATIONAL) += rational.o obj-$(CONFIG_LIBAVB) += libavb/ obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += libfdt/ -ifneq ($(CONFIG_$(SPL_TPL_)BUILD)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy) -obj-$(CONFIG_$(SPL_TPL_)OF_CONTROL) += fdtdec_common.o -obj-$(CONFIG_$(SPL_TPL_)OF_CONTROL) += fdtdec.o -endif +obj-$(CONFIG_$(SPL_TPL_)OF_REAL) += fdtdec_common.o fdtdec.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_YMODEM_SUPPORT) += crc16.o diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 25a3e7fa52e..fb28b2b10f0 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -295,18 +295,15 @@ else FINAL_DTB_CONTAINER = $(obj)/$(SPL_BIN).multidtb.fit endif -# Build the .dtb file if: -# - we are not using OF_PLATDATA -# - we are using OF_CONTROL +# Build the .dtb file if needed +# - OF_REAL is enabled # - we have either OF_SEPARATE or OF_HOSTFILE build_dtb := -ifeq ($(CONFIG_$(SPL_TPL_)OF_PLATDATA),) -ifneq ($(CONFIG_$(SPL_TPL_)OF_CONTROL),) +ifneq ($(CONFIG_$(SPL_TPL_)OF_REAL),) ifeq ($(CONFIG_OF_SEPARATE)$(CONFIG_OF_HOSTFILE),y) build_dtb := y endif endif -endif ifneq ($(build_dtb),) $(obj)/$(SPL_BIN)-dtb.bin: $(obj)/$(SPL_BIN)-nodtb.bin \ -- 2.32.0.605.g8dce9f2422-goog