Skip to contentSkip to conversation

kbuild: Add dtc flag test

PATCH In review Elliot Berman 3 participants 3 messages Aug 5, 2020 – May 24, 2021 1 message not in the archive Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: Add dtc flag test

Host dtc may not support the same flags as kernel's copy of dtc. Test if dtc supports each flag when the dtc comes from host.

---
 scripts/Makefile.lib | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)
scripts/Makefile.lib +22 -12
index 841ac03..2722a67 100644
@@ -274,25 +274,35 @@ quiet_cmd_gzip = GZIP    $@
 
 # DTC
 # ---------------------------------------------------------------------------
+ifeq ("$(origin DTC)", "command line")
+PHONY += $(DTC)
+dtc-option = $(call try-run, $(DTC) $1 -v,$1)
+else
+# Just add the flag. DTC is compiled later as a prerequisite, so there's no dtc
+# to test the flag against. This is okay because we're not testing flags which
+# aren't supported by in-kernel dtc to begin with.
+dtc-option = $1
+endif
+
 DTC ?= $(objtree)/scripts/dtc/dtc
-DTC_FLAGS += -Wno-interrupt_provider
+DTC_FLAGS += $(call dtc-option,-Wno-interrupt_provider)
 
 # Disable noisy checks by default
 ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),)
-DTC_FLAGS += -Wno-unit_address_vs_reg \
-	-Wno-unit_address_format \
-	-Wno-avoid_unnecessary_addr_size \
-	-Wno-alias_paths \
-	-Wno-graph_child_address \
-	-Wno-simple_bus_reg \
-	-Wno-unique_unit_address \
-	-Wno-pci_device_reg
+DTC_FLAGS += $(call dtc-option,-Wno-unit_address_vs_reg) \
+	$(call dtc-option,-Wno-unit_address_format) \
+	$(call dtc-option,-Wno-avoid_unnecessary_addr_size) \
+	$(call dtc-option,-Wno-alias_paths) \
+	$(call dtc-option,-Wno-graph_child_address) \
+	$(call dtc-option,-Wno-simple_bus_reg) \
+	$(call dtc-option,-Wno-unique_unit_address) \
+	$(call dtc-option,-Wno-pci_device_reg)
 endif
 
 ifneq ($(findstring 2,$(KBUILD_EXTRA_WARN)),)
-DTC_FLAGS += -Wnode_name_chars_strict \
-	-Wproperty_name_chars_strict \
-	-Winterrupt_provider
+DTC_FLAGS += $(call dtc-option,-Wnode_name_chars_strict) \
+	$(call dtc-option,-Wproperty_name_chars_strict) \
+	$(call dtc-option,-Winterrupt_provider)
 endif
 
 DTC_FLAGS += $(DTC_FLAGS_$(basetarget))
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#1 lore raw
Quoted 5 lines · Elliot Berman

Host dtc may not support the same flags as kernel's copy of dtc. Test if dtc supports each flag when the dtc comes from host.

I think this supports only the newer external DTC, but not older ones.

This feature is intended to test the upstream DTC
before resyncing in-kernel scripts/dtc/.

Quoted 60 lines
---
 scripts/Makefile.lib | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)
scripts/Makefile.lib +22 -13
index 841ac03..2722a67 100644
@@ -274,25 +274,35 @@ quiet_cmd_gzip = GZIP    $@
 
 # DTC
 # ---------------------------------------------------------------------------
+ifeq ("$(origin DTC)", "command line")
+PHONY += $(DTC)
+dtc-option = $(call try-run, $(DTC) $1 -v,$1)
+else
+# Just add the flag. DTC is compiled later as a prerequisite, so there's no dtc
+# to test the flag against. This is okay because we're not testing flags which
+# aren't supported by in-kernel dtc to begin with.
+dtc-option = $1
+endif
+
 DTC ?= $(objtree)/scripts/dtc/dtc
-DTC_FLAGS += -Wno-interrupt_provider
+DTC_FLAGS += $(call dtc-option,-Wno-interrupt_provider)
 
 # Disable noisy checks by default
 ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),)
-DTC_FLAGS += -Wno-unit_address_vs_reg \
-       -Wno-unit_address_format \
-       -Wno-avoid_unnecessary_addr_size \
-       -Wno-alias_paths \
-       -Wno-graph_child_address \
-       -Wno-simple_bus_reg \
-       -Wno-unique_unit_address \
-       -Wno-pci_device_reg
+DTC_FLAGS += $(call dtc-option,-Wno-unit_address_vs_reg) \
+       $(call dtc-option,-Wno-unit_address_format) \
+       $(call dtc-option,-Wno-avoid_unnecessary_addr_size) \
+       $(call dtc-option,-Wno-alias_paths) \
+       $(call dtc-option,-Wno-graph_child_address) \
+       $(call dtc-option,-Wno-simple_bus_reg) \
+       $(call dtc-option,-Wno-unique_unit_address) \
+       $(call dtc-option,-Wno-pci_device_reg)
 endif
 
 ifneq ($(findstring 2,$(KBUILD_EXTRA_WARN)),)
-DTC_FLAGS += -Wnode_name_chars_strict \
-       -Wproperty_name_chars_strict \
-       -Winterrupt_provider
+DTC_FLAGS += $(call dtc-option,-Wnode_name_chars_strict) \
+       $(call dtc-option,-Wproperty_name_chars_strict) \
+       $(call dtc-option,-Winterrupt_provider)
 endif
 
 DTC_FLAGS += $(DTC_FLAGS_$(basetarget))
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

Signature · 2 lines
Best Regards
Masahiro Yamada

A message that is not in the archive (sent off-list or not yet received): CAF2Aj3j7S3YXM-eFxWR7vOUMmN=gDEenmNLZP31iDTkBWG2PgQ@mail.gmail.com

#3 lore raw
Quoted 11 lines · Lee Jones
Quoted 9 lines · Masahiro Yamada
Quoted 5 lines · Elliot Berman

Host dtc may not support the same flags as kernel's copy of dtc. Test if dtc supports each flag when the dtc comes from host.

Quoted 8 lines
Quoted 5 lines

I think this supports only the newer external DTC, but not older ones.

This feature is intended to test the upstream DTC
before resyncing in-kernel scripts/dtc/.

Was there ever a follow-up to this?

As Masahiro said, using an older dtc is not a usecase we care about.

Rob