From patchwork Mon Mar 8 10:45:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 12121953 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=-18.8 required=3.0 tests=BAYES_00,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 71B99C433E9 for ; Mon, 8 Mar 2021 10:46:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37250651DD for ; Mon, 8 Mar 2021 10:46:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231631AbhCHKpe (ORCPT ); Mon, 8 Mar 2021 05:45:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231343AbhCHKp2 (ORCPT ); Mon, 8 Mar 2021 05:45:28 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0691DC06175F for ; Mon, 8 Mar 2021 02:45:28 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id kr3-20020a17090b4903b02900c096fc01deso2882101pjb.4 for ; Mon, 08 Mar 2021 02:45:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eTA/ruWCUgwnz7vARSSAyGAv3Tz9MwTQ6Galh4vgX/g=; b=oBqswjRqRn4rXSpsI9MSF4+KacaCLN3XZrU7xPy4TToCrDCIOUzHUegWYNFEE0dZK/ Kybw0tW9U12gi47Jnd/tqRCC3afZIj70Au0SFZKvVYpPGlVKxlGPYwmLv0aWM2oaxZNw nqnw446HiOKBjPpepVHTkUjLbpq6lg3ifTb3d1eomQxkLMhvon3UKp/SuqAAwrZle34U sqlOFONJHf4/LEtOLN8B3+Sirf7eB5rqeLO9QwT5vkDAMnw2SkF8mnExyr6WEMLgOvE+ GW/+KeMNVuisOMCBEx1oAaXpk1cVHILTi1Sb/cm5CaO9q7rIAbqG/eQVqTQqaP3Zh7Nx E7nw== 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=eTA/ruWCUgwnz7vARSSAyGAv3Tz9MwTQ6Galh4vgX/g=; b=C5poSF+B3bYeMcfjF+T2Yt3bRMYOur7dYAZaI9AT63afj+9LXA0lnGnO3fJCqIg4K6 v+Jw8gq1N7Z7N/98qlxlrdf8KkjpxB/SLskz1+fH6UVzdy0F9Rh4R2gv8OU9jyoVE9Ns IcyTafCtT4Ud3JSFZphQ6/S0FDAnALzZwnrFwKQk0QBm4TQCUeZ0P18vNqOb/xyek1wk zKUY+7aG0LaNVGS0n/eeWeHMcrkHB2K7uqltqSeCl0yGrlugYA+IJvEObxfpbtX6lsvS zYsNqBZREx+NbOAC+Nolp+MMdXkj7e9tbaV7L8f0qdA2vly8HyiceM1vMafxTD37rpHx xlyQ== X-Gm-Message-State: AOAM533jtDOK+bJtbl1BlUmVqWofALNF+nHR8xT85wImb/x8VS7h7DqX K8dmf+ZK1hpInVKcLTZzu3nBDw== X-Google-Smtp-Source: ABdhPJxMyvdJDEXud0R+2Kv4hYjscqohz+0TwHZhv+B9DYYlregglmwZYrvHybI0elbJFi3Hfxo8dQ== X-Received: by 2002:a17:90b:1105:: with SMTP id gi5mr23855730pjb.26.1615200327589; Mon, 08 Mar 2021 02:45:27 -0800 (PST) Received: from localhost ([122.171.124.15]) by smtp.gmail.com with ESMTPSA id e65sm7853652pfe.9.2021.03.08.02.45.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Mar 2021 02:45:27 -0800 (PST) From: Viresh Kumar To: Masahiro Yamada , Michal Marek Cc: Viresh Kumar , Vincent Guittot , David Gibson , Frank Rowand , Michal Simek , Geert Uytterhoeven , anmar.oueja@linaro.org, Bill Mills , Geert Uytterhoeven , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V10 3/5] kbuild: Allow .dtso format for overlay source files Date: Mon, 8 Mar 2021 16:15:08 +0530 Message-Id: <83217a5e3c964da13d3e69e79d2a1c898d98f63e.1615199908.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Since the overlays dtb files are now named as .dtbo, there is a lot of interest in similarly naming the overlay source dts files as .dtso. This patch makes the necessary changes to allow .dtso format for overlay source files. Note that we still support generating .dtbo files from .dts files. This is required for the source files present in drivers/of/unittest-data/, because they can't be renamed to .dtso as they are used for some runtime testing as well. Reviewed-by: Geert Uytterhoeven Tested-by: Geert Uytterhoeven Signed-off-by: Viresh Kumar --- scripts/Makefile.lib | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index bc045a54a34e..59e86f67f9e0 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -339,7 +339,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE quiet_cmd_dtc = DTC $@ cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ - $(DTC) -O $(patsubst .%,%,$(suffix $@)) -o $@ -b 0 \ + $(DTC) -I dts -O $(patsubst .%,%,$(suffix $@)) -o $@ -b 0 \ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) @@ -347,9 +347,13 @@ cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE $(call if_changed_dep,dtc) +# Required for of unit-test files as they can't be renamed to .dtso $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE $(call if_changed_dep,dtc) +$(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE + $(call if_changed_dep,dtc) + overlay-y := $(addprefix $(obj)/, $(overlay-y)) quiet_cmd_fdtoverlay = DTOVL $@ @@ -375,6 +379,9 @@ endef $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE $(call if_changed_rule,dtc,yaml) +$(obj)/%.dt.yaml: $(src)/%.dtso $(DTC) $(DT_TMP_SCHEMA) FORCE + $(call if_changed_rule,dtc,yaml) + dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) # Bzip2