From patchwork Fri Feb 21 16:12:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre TORGUE X-Patchwork-Id: 204460 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=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 BC0C3C35646 for ; Fri, 21 Feb 2020 16:13:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9332124656 for ; Fri, 21 Feb 2020 16:13:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=st.com header.i=@st.com header.b="eJbIrsJY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727781AbgBUQMy (ORCPT ); Fri, 21 Feb 2020 11:12:54 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:55331 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727039AbgBUQMu (ORCPT ); Fri, 21 Feb 2020 11:12:50 -0500 Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01LG83M6008257; Fri, 21 Feb 2020 17:12:23 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=84l2b91e/di7VUflYudfHEI8dwDeDuErqQcawADT30M=; b=eJbIrsJYUQ2ZOSZ/PQkd/4nlZgrFvcK9JbFCrGcLZhnboFdyJRziUg7iyQc/HMnD+7+4 tiHe0B7gRQx4wom954tO7ehuk3/I0lBeqZpnHCL8I76+LB3J1ldZx0ngZlGj3eQMaTNr XhCroGu8re8Q1j99sPeMQCjjYI/nc06ebb/snLCaYtRZ/oph6tKZjBoEMGQyaj0z92nd 4nQuKbBAR27di/pTockDqlr5UUsLyOO8GG9oET+q5pXKHknUl0K01US6ZNnpBifinSTr AVR/7zS0EafkNjYfKTNY1BsuUjW8sFgKy9evj+ECNZWZMZEYnmXqpd3GpKF3SiGvFTOJ ew== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2y8ub1r63v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2020 17:12:23 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id A96F310002A; Fri, 21 Feb 2020 17:12:20 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag3node2.st.com [10.75.127.8]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 9C53E2BE24B; Fri, 21 Feb 2020 17:12:20 +0100 (CET) Received: from localhost (10.75.127.48) by SFHDAG3NODE2.st.com (10.75.127.8) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 21 Feb 2020 17:12:19 +0100 From: Alexandre Torgue To: , Frank Rowand , Masahiro Yamada , Michal Marek , , CC: , Alexandre Torgue , , , , Ian Lepore Subject: [RFC PATCH v2 1/4] scripts: Add script to generate dtb build information Date: Fri, 21 Feb 2020 17:12:14 +0100 Message-ID: <20200221161217.20069-2-alexandre.torgue@st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200221161217.20069-1-alexandre.torgue@st.com> References: <20200221161217.20069-1-alexandre.torgue@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.48] X-ClientProxiedBy: SFHDAG8NODE3.st.com (10.75.127.24) To SFHDAG3NODE2.st.com (10.75.127.8) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-02-21_05:2020-02-21,2020-02-21 signatures=0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This commit adds a new script to create a file (in dts file directory) with some information (date, Linux version, user). This file could then be used to populate "build-info" property in every dts file that would use this build information: Example: / { ... build-info = /incbin/("dtb-build.txt"); ... }; Signed-off-by: Alexandre Torgue diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index bae62549e3d2..a5af84ef4ffc 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -246,6 +246,7 @@ quiet_cmd_gzip = GZIP $@ # DTC # --------------------------------------------------------------------------- DTC ?= $(objtree)/scripts/dtc/dtc +DTB_GEN_INFO ?= $(objtree)/scripts/gen_dtb_build_info.sh # Disable noisy checks by default ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),) @@ -286,6 +287,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE quiet_cmd_dtc = DTC $@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ + $(DTB_GEN_INFO) $(src) ; \ $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ $(DTC) -O $(2) -o $@ -b 0 \ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ diff --git a/scripts/gen_dtb_build_info.sh b/scripts/gen_dtb_build_info.sh new file mode 100755 index 000000000000..0cd8bd98e410 --- /dev/null +++ b/scripts/gen_dtb_build_info.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +set -o nounset + +DTB_DIR=$1 +DTB_COMPILE_BY=$(whoami | sed 's/\\/\\\\/') +DTB_INFO="From Linux $KERNELRELEASE by $DTB_COMPILE_BY the $(date).\0" + +printf "$DTB_INFO" > "$DTB_DIR/dtb-build.txt" From patchwork Fri Feb 21 16:14:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre TORGUE X-Patchwork-Id: 204459 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=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,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 AFA71C35656 for ; Fri, 21 Feb 2020 16:14:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81CB224650 for ; Fri, 21 Feb 2020 16:14:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=st.com header.i=@st.com header.b="bmhKR4Jj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729431AbgBUQOp (ORCPT ); Fri, 21 Feb 2020 11:14:45 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:54919 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727095AbgBUQOn (ORCPT ); Fri, 21 Feb 2020 11:14:43 -0500 Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01LGEEAB013474; Fri, 21 Feb 2020 17:14:26 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=2k+VXll0ozFYAI5ID9m7C2U0U8scssOA0fcMpcXtXIM=; b=bmhKR4Jj2v4OBlocrm1fUnIqFZz6PDmU/lALGE8c/S1Dj2kVFDH/OkRqbjUaGi/V3Tlr K77vwuIaiqGVoqS5DBpCnenFIKPYDi4NFDdJmNclLpvOXHnxJmO2aBTI2KByDUNZWL2o F7B/3m8EP3WB6dnAbZVr6K4kPn3HLdGFvgrQPn/2fhCoI8Ip4GHVF3pz0LIjNIjf93jh QjQELb05eRu1BPqSul0VyjuZRMGWSpzmXVxGCJ4MOFLnFRdJjbP/ZZulWslmUISV/8ZH GlrMSEfOyOe4t3e2o2RgGiWpzlFI55wqk6Iftd0O/ulSgZOFDxwrdRmVcopnkuhCNegL KQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2y8ub1r6dt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2020 17:14:26 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 0B190100038; Fri, 21 Feb 2020 17:14:22 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag3node2.st.com [10.75.127.8]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id F042E2BE258; Fri, 21 Feb 2020 17:14:21 +0100 (CET) Received: from localhost (10.75.127.50) by SFHDAG3NODE2.st.com (10.75.127.8) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 21 Feb 2020 17:14:21 +0100 From: Alexandre Torgue To: , Frank Rowand , Masahiro Yamada , Michal Marek , , CC: , Alexandre Torgue , , , , Ian Lepore Subject: [RFC PATCH v2 2/4] of: fdt: print dtb build information Date: Fri, 21 Feb 2020 17:14:16 +0100 Message-ID: <20200221161418.20225-3-alexandre.torgue@st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200221161418.20225-1-alexandre.torgue@st.com> References: <20200221161418.20225-1-alexandre.torgue@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.50] X-ClientProxiedBy: SFHDAG6NODE3.st.com (10.75.127.18) To SFHDAG3NODE2.st.com (10.75.127.8) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-02-21_05:2020-02-21,2020-02-21 signatures=0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This commit prints out DTB build information (build time, dts source version used, ...) if "Build-info" property exists in DTB root node. Signed-off-by: Alexandre Torgue diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 2cdf64d2456f..aa5989039746 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1224,9 +1224,18 @@ bool __init early_init_dt_scan(void *params) */ void __init unflatten_device_tree(void) { + const char *build_info; + unsigned long dt_root; + __unflatten_device_tree(initial_boot_params, NULL, &of_root, early_init_dt_alloc_memory_arch, false); + /* If available, provide dtb build information */ + dt_root = of_get_flat_dt_root(); + build_info = of_get_flat_dt_prop(dt_root, "build-info", NULL); + if (build_info) + pr_info("%s\n", build_info); + /* Get pointer to "/chosen" and "/aliases" nodes for use everywhere */ of_alias_scan(early_init_dt_alloc_memory_arch); From patchwork Fri Feb 21 16:14:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre TORGUE X-Patchwork-Id: 204458 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=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,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 0347EC35657 for ; Fri, 21 Feb 2020 16:14:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE67924650 for ; Fri, 21 Feb 2020 16:14:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=st.com header.i=@st.com header.b="Y2zDz/hs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729481AbgBUQOu (ORCPT ); Fri, 21 Feb 2020 11:14:50 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:9560 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729454AbgBUQOu (ORCPT ); Fri, 21 Feb 2020 11:14:50 -0500 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01LGE9ZJ009872; Fri, 21 Feb 2020 17:14:27 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=j0cy0mKA7cM8Tk6Z9M9zdWvIoHNs4Pm0R3aUHtmCHIs=; b=Y2zDz/hsRrUDG815gVDc1oEZ8UmjKwq9y+nocwidSm+jGXAmlrXRPQKP3u5Fqz0eKtZ1 kFSmzIASg8pgLFehDf2/NpiSxvIh8K95JsjR7xRA/Uu1RPtgVH4VRSNtigVVE0c+Zkqa v0XPiPVVvfLqUI/kv8Ikm4illMval7rbA+qi8vndSUi2riaIjAoZAdytnwUPRVnhu2sK 5Vci8VOIPZS8vjVyWW9VoQijdzNtk9JKfZQHxKgz+/fy2W1Qy3rtxQfxVlj3ZS9BOvID oRfoO/pPLH7pJQafI22gjJKq6gYoqlBMaexIhwWyachx4E0XCZCGVEP0hlDFgEJlQZgg aA== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2y8ub0g6bu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Feb 2020 17:14:27 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 5570710003A; Fri, 21 Feb 2020 17:14:23 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag3node2.st.com [10.75.127.8]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 477C62BE258; Fri, 21 Feb 2020 17:14:23 +0100 (CET) Received: from localhost (10.75.127.49) by SFHDAG3NODE2.st.com (10.75.127.8) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 21 Feb 2020 17:14:22 +0100 From: Alexandre Torgue To: , Frank Rowand , Masahiro Yamada , Michal Marek , , CC: , Alexandre Torgue , , , , Ian Lepore Subject: [RFC PATCH v2 4/4] script: make automatic dtb build info generation Date: Fri, 21 Feb 2020 17:14:18 +0100 Message-ID: <20200221161418.20225-5-alexandre.torgue@st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200221161418.20225-1-alexandre.torgue@st.com> References: <20200221161418.20225-1-alexandre.torgue@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.49] X-ClientProxiedBy: SFHDAG2NODE1.st.com (10.75.127.4) To SFHDAG3NODE2.st.com (10.75.127.8) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-02-21_05:2020-02-21,2020-02-21 signatures=0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Append each "xxx.dtb.dts.tmp" file with "build-info" entry during dtb build. It allows to get build information (date, source version, ...) for each device tree without modify them manually. Signed-off-by: Alexandre Torgue diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index a5af84ef4ffc..f084e78267b2 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -289,6 +289,7 @@ quiet_cmd_dtc = DTC $@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ $(DTB_GEN_INFO) $(src) ; \ $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ + $(DTB_GEN_INFO) $(src) $(dtc-tmp) ; \ $(DTC) -O $(2) -o $@ -b 0 \ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ diff --git a/scripts/gen_dtb_build_info.sh b/scripts/gen_dtb_build_info.sh index 0cd8bd98e410..72f31e386787 100755 --- a/scripts/gen_dtb_build_info.sh +++ b/scripts/gen_dtb_build_info.sh @@ -6,5 +6,7 @@ set -o nounset DTB_DIR=$1 DTB_COMPILE_BY=$(whoami | sed 's/\\/\\\\/') DTB_INFO="From Linux $KERNELRELEASE by $DTB_COMPILE_BY the $(date).\0" +DTS_FILE=$2 -printf "$DTB_INFO" > "$DTB_DIR/dtb-build.txt" +printf "$DTB_INFO" > "arch/arm/boot/dts/dtb-build.txt" +echo "&{/} {build-info = /incbin/(\"dtb-build.txt\");};" >> $DTS_FILE