kbuild: remove unneeded -O option to dtc
PATCH 1/1 kbuild: remove unneeded -O option to dtc
This piece of code converts the target suffix to the dtc -O option:
*.dtb -> -O dtb
*.dt.yaml -> -O yamlCommit ce88c9c79455 ("kbuild: Add support to build overlays (%.dtbo)") added the third case:
*.dtbo -> -O dtbo
This works thanks to commit 163f0469bf2e ("dtc: Allow overlays to have .dtbo extension") in the upstream DTC, which has already been pulled in the kernel.
However, I think it is a bit odd because "dtbo" is not a format name. At least, it does not show up in the help message of dtc.
$ scripts/dtc/dtc --help
[ snip ]
-O, --out-format <arg>
Output formats are:
dts - device tree source text
dtb - device tree blob
yaml - device tree encoded as YAML
asm - assembler sourceSo, I am not a big fan of the second hunk of that change:
} else if (streq(outform, "dtbo")) {
dt_to_blob(outf, dti, outversion);Anyway, we did not need to do this in Makefile in the first place.
guess_type_by_name() had already understood ".yaml" before commit 4f0e3a57d6eb ("kbuild: Add support for DT binding schema checks"), and now does ".dtbo" as well.
Makefile does not need to duplicate the same logic. Let's leave it to dtc.
---
scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.lib +1 -1
@@ -327,7 +327,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) -o $@ -b 0 \ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
Signature · 1 line
2.27.0
Quoted 26 lines · Masahiro Yamada
This piece of code converts the target suffix to the dtc -O option:
*.dtb -> -O dtb *.dt.yaml -> -O yamlCommit
ce88c9c79455("kbuild: Add support to build overlays (%.dtbo)") added the third case:*.dtbo -> -O dtboThis works thanks to commit
163f0469bf2e("dtc: Allow overlays to have .dtbo extension") in the upstream DTC, which has already been pulled in the kernel.However, I think it is a bit odd because "dtbo" is not a format name. At least, it does not show up in the help message of dtc.
$ scripts/dtc/dtc --help [ snip ] -O, --out-format <arg> Output formats are: dts - device tree source text dtb - device tree blob yaml - device tree encoded as YAML asm - assembler source
Quoted 4 lines
So, I am not a big fan of the second hunk of that change:
} else if (streq(outform, "dtbo")) { dt_to_blob(outf, dti, outversion);
Looking at the very first version of the patch I sent,
this change was the only thing that was required to make it work.
I think the reason was that "outform != NULL" as -O option was passed by the kernel.
Quoted 20 lines
Anyway, we did not need to do this in
Makefilein the first place.
guess_type_by_name()had already understood ".yaml" before commit4f0e3a57d6eb("kbuild: Add support for DT binding schema checks"), and now does ".dtbo" as well.
Makefiledoes not need to duplicate the same logic. Let's leave it to dtc.Signed-off-by Masahiro Yamada <[email protected]>---
scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/Makefile.lib +0
-0
scripts/Makefile.lib $(obj)/%.dtb.S: $(obj)/%.dtb FORCE · line 333
Quoted 8 lines
scripts/Makefile.lib +1
-1@@ -327,7 +327,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) -o $@ -b 0 \ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
LGTM.
Signature · 1 line
viresh
Quoted 52 lines · Masahiro Yamada
This piece of code converts the target suffix to the dtc -O option:
*.dtb -> -O dtb *.dt.yaml -> -O yamlCommit
ce88c9c79455("kbuild: Add support to build overlays (%.dtbo)") added the third case:*.dtbo -> -O dtboThis works thanks to commit
163f0469bf2e("dtc: Allow overlays to have .dtbo extension") in the upstream DTC, which has already been pulled in the kernel.However, I think it is a bit odd because "dtbo" is not a format name. At least, it does not show up in the help message of dtc.
$ scripts/dtc/dtc --help [ snip ] -O, --out-format <arg> Output formats are: dts - device tree source text dtb - device tree blob yaml - device tree encoded as YAML asm - assembler sourceSo, I am not a big fan of the second hunk of that change:
} else if (streq(outform, "dtbo")) { dt_to_blob(outf, dti, outversion);Anyway, we did not need to do this in
Makefilein the first place.
guess_type_by_name()had already understood ".yaml" before commit4f0e3a57d6eb("kbuild: Add support for DT binding schema checks"), and now does ".dtbo" as well.
Makefiledoes not need to duplicate the same logic. Let's leave it to dtc.Signed-off-by Masahiro Yamada <[email protected]>---
scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/Makefile.lib +0
-0
scripts/Makefile.lib $(obj)/%.dtb.S: $(obj)/%.dtb FORCE · line 333
Quoted 8 lines
scripts/Makefile.lib +1
-1@@ -327,7 +327,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) -o $@ -b 0 \ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
I think you should also drop 'yaml' from:
$(call if_changed_rule,dtc,yaml)
Though that's somewhat separate, so either way:
Rob