From patchwork Tue Feb 25 23:07:19 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Masahiro Yamada <masahiroy@kernel.org>
X-Patchwork-Id: 236811
List-Id: U-Boot discussion <u-boot.lists.denx.de>
From: masahiroy at kernel.org (Masahiro Yamada)
Date: Wed, 26 Feb 2020 08:07:19 +0900
Subject: [PATCHv2 2/4] kbuild: Re-sync DTC flag logic with v4.17
In-Reply-To: <20200224175035.2239-2-trini@konsulko.com>
References: <20200224175035.2239-1-trini@konsulko.com>
 <20200224175035.2239-2-trini@konsulko.com>
Message-ID: <CAK7LNAQbsaWV8abUzQS-XWB+mi+0uxy5fLvFJ=XPAmEPDUs_-Q@mail.gmail.com>

Hi Tom,


On Tue, Feb 25, 2020 at 2:50 AM Tom Rini <trini at 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 at konsulko.com>


If you entirely move DTC_FLAGS to scripts/Makefile.lib,
you can git rid of 'export DTC_FLAGS' from the top Makefile.






<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
>

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