| Message ID | 20200221161418.20225-2-alexandre.torgue@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add device tree build information | expand |
On 2/21/20 10:14 AM, Alexandre Torgue wrote: > 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"); s/.txt/.dtsi/ and same wherever the file name is used. > ... > }; > > Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com> > > 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" I would remove the filler words "From", "by", "the", and the trailing period ('.'). <bikeshed> You might consider using a format more like the Linux kernel version line, which puts parenthesis around the compiled by info. </bikeshed> -Frank > + > +printf "$DTB_INFO" > "$DTB_DIR/dtb-build.txt" >
On Fri, Feb 21, 2020 at 11:52 AM Frank Rowand <frowand.list@gmail.com> wrote: > > On 2/21/20 10:14 AM, Alexandre Torgue wrote: > > 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"); > > s/.txt/.dtsi/ > > and same wherever the file name is used. > > > > ... > > }; > > > > Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com> > > > > 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" > > I would remove the filler words "From", "by", "the", and the trailing > period ('.'). > > <bikeshed> > You might consider using a format more like the Linux > kernel version line, which puts parenthesis around the > compiled by info. IMO, we should use exactly the Linux kernel version line. Or exactly the u-boot version line when built in u-boot. Rob
On Fri, Feb 21, 2020 at 11:52:34AM -0600, Frank Rowand wrote: > On 2/21/20 10:14 AM, Alexandre Torgue wrote: > > 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"); > > s/.txt/.dtsi/ I don't think that makes sense. This is an /incbin/ not an /include/ so the text file is *not* dts information. > and same wherever the file name is used. > > > > ... > > }; > > > > Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com> > > > > 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" > > I would remove the filler words "From", "by", "the", and the trailing > period ('.'). > > <bikeshed> > You might consider using a format more like the Linux > kernel version line, which puts parenthesis around the > compiled by info. > </bikeshed> > > -Frank > > > + > > +printf "$DTB_INFO" > "$DTB_DIR/dtb-build.txt" > > >
On 2/23/20 3:59 PM, David Gibson wrote: > On Fri, Feb 21, 2020 at 11:52:34AM -0600, Frank Rowand wrote: >> On 2/21/20 10:14 AM, Alexandre Torgue wrote: >>> 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"); >> >> s/.txt/.dtsi/ > > I don't think that makes sense. This is an /incbin/ not an /include/ > so the text file is *not* dts information. You are right, thanks for catching that. -Frank > >> and same wherever the file name is used. >> >> >>> ... >>> }; >>> >>> Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com> >>> >>> 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" >> >> I would remove the filler words "From", "by", "the", and the trailing >> period ('.'). >> >> <bikeshed> >> You might consider using a format more like the Linux >> kernel version line, which puts parenthesis around the >> compiled by info. >> </bikeshed> >> >> -Frank >> >>> + >>> +printf "$DTB_INFO" > "$DTB_DIR/dtb-build.txt" >>> >> >
On 2/21/20 8:38 PM, Rob Herring wrote: > On Fri, Feb 21, 2020 at 11:52 AM Frank Rowand <frowand.list@gmail.com> wrote: >> >> On 2/21/20 10:14 AM, Alexandre Torgue wrote: >>> 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"); >> >> s/.txt/.dtsi/ >> >> and same wherever the file name is used. >> >> >>> ... >>> }; >>> >>> Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com> >>> >>> 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" >> >> I would remove the filler words "From", "by", "the", and the trailing >> period ('.'). >> >> <bikeshed> >> You might consider using a format more like the Linux >> kernel version line, which puts parenthesis around the >> compiled by info. > > IMO, we should use exactly the Linux kernel version line. Or exactly > the u-boot version line when built in u-boot. I agree to keep the same format than Linux banner. But does it make sense to keep uts version, config flags ? regards Alex > > Rob >
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"
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 <alexandre.torgue@st.com>