| Message ID | 20200224175035.2239-2-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | e0d1a89a5baec862a71384f7ddeebdf9d9c4ec63 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [PATCHv2,1/4] kbuild: fixdep: Resync this with v4.17 | expand |
Hi Tom, On Tue, Feb 25, 2020 at 2:50 AM Tom Rini <trini@konsulko.com> wrote: > > The way that we have been handling additional DTC warning flags hasn't > matched the way the Linux Kernel does. Resync this logic with v4.17. > > Signed-off-by: Tom Rini <trini@konsulko.com> If you entirely move DTC_FLAGS to scripts/Makefile.lib, you can git rid of 'export DTC_FLAGS' from the top Makefile. diff --git a/Makefile b/Makefile index 66b72105c1..0b049e00d9 100644 --- a/Makefile +++ b/Makefile @@ -431,7 +431,7 @@ export ARCH CPU BOARD VENDOR SOC CPUDIR BOARDDIR export CONFIG_SHELL HOSTCC HOSTCFLAGS HOSTLDFLAGS CROSS_COMPILE AS LD CC export CPP AR NM LDR STRIP OBJCOPY OBJDUMP export MAKE LEX YACC AWK PERL PYTHON PYTHON2 PYTHON3 -export HOSTCXX HOSTCXXFLAGS CHECK CHECKFLAGS DTC DTC_FLAGS +export HOSTCXX HOSTCXXFLAGS CHECK CHECKFLAGS DTC export KBUILD_CPPFLAGS NOSTDINC_FLAGS UBOOTINCLUDE OBJCOPYFLAGS LDFLAGS export KBUILD_CFLAGS KBUILD_AFLAGS <snip> > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index 30f392fdfb08..bfb5851e9bfa 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -274,6 +274,22 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \ > # DTC > # --------------------------------------------------------------------------- > If you want to re-sync this hunk completely, you can move DTC ?= $(objtree)/scripts/dtc/dtc here from the top Makefile. I leave it up to you. (You need to get rid of 'export DTC' in that case) I just noticed $(DTC) is no longer used in the top Makefile. Hence, this patch. http://patchwork.ozlabs.org/patch/1244561/ > +# Disable noisy checks by default > +ifeq ($(findstring 1,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),) > +DTC_FLAGS += -Wno-unit_address_vs_reg \ > + -Wno-unit_address_format \ > + -Wno-avoid_unnecessary_addr_size \ > + -Wno-alias_paths \ > + -Wno-pci_device_reg > +endif > + > +ifneq ($(findstring 2,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),) > +DTC_FLAGS += -Wnode_name_chars_strict \ > + -Wproperty_name_chars_strict > +endif > + > +DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) > + > # Generate an assembly file to wrap the output of the device tree compiler > quiet_cmd_dt_S_dtb= DTB $@ > # Modified for U-Boot > -- > 2.17.1 >
On Mon, Feb 24, 2020 at 12:50:33PM -0500, Tom Rini wrote: > The way that we have been handling additional DTC warning flags hasn't > matched the way the Linux Kernel does. Resync this logic with v4.17. > > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/next, thanks!
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn index 1105c76be12f..80231fbddfda 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn @@ -56,25 +56,4 @@ endif KBUILD_CFLAGS += $(warning) -dtc-warning-2 += -Wnode_name_chars_strict -dtc-warning-2 += -Wproperty_name_chars_strict - -dtc-warning := $(dtc-warning-$(findstring 1, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) -dtc-warning += $(dtc-warning-$(findstring 2, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) -dtc-warning += $(dtc-warning-$(findstring 3, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS))) - -DTC_FLAGS += $(dtc-warning) - -else - -# Disable noisy checks by default -DTC_FLAGS += -Wno-unit_address_vs_reg -DTC_FLAGS += -Wno-simple_bus_reg -DTC_FLAGS += -Wno-unit_address_format -DTC_FLAGS += -Wno-pci_bridge -DTC_FLAGS += -Wno-pci_device_bus_num -DTC_FLAGS += -Wno-pci_device_reg -DTC_FLAGS += -Wno-avoid_unnecessary_addr_size -DTC_FLAGS += -Wno-alias_paths - endif diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 30f392fdfb08..bfb5851e9bfa 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -274,6 +274,22 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \ # DTC # --------------------------------------------------------------------------- +# Disable noisy checks by default +ifeq ($(findstring 1,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),) +DTC_FLAGS += -Wno-unit_address_vs_reg \ + -Wno-unit_address_format \ + -Wno-avoid_unnecessary_addr_size \ + -Wno-alias_paths \ + -Wno-pci_device_reg +endif + +ifneq ($(findstring 2,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),) +DTC_FLAGS += -Wnode_name_chars_strict \ + -Wproperty_name_chars_strict +endif + +DTC_FLAGS += $(DTC_FLAGS_$(basetarget)) + # Generate an assembly file to wrap the output of the device tree compiler quiet_cmd_dt_S_dtb= DTB $@ # Modified for U-Boot
The way that we have been handling additional DTC warning flags hasn't matched the way the Linux Kernel does. Resync this logic with v4.17. Signed-off-by: Tom Rini <trini@konsulko.com> --- scripts/Makefile.extrawarn | 21 --------------------- scripts/Makefile.lib | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 21 deletions(-)