lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 9 Nov 2017 14:34:38 -0600 From: Rob Herring <robh+dt@...nel.org> To: Masahiro Yamada <yamada.masahiro@...ionext.com> Cc: James Hogan <james@...anarts.com>, "devicetree@...r.kernel.org" <devicetree@...r.kernel.org>, Linux Kbuild mailing list <linux-kbuild@...r.kernel.org>, Mark Rutland <mark.rutland@....com>, Pantelis Antoniou <pantelis.antoniou@...sulko.com>, ARM Kernel List <linux-arm-kernel@...ts.infradead.org>, Arnd Bergmann <arnd@...db.de>, LKML <linux-kernel@...r.kernel.org>, Michal Marek <michal.lkml@...kovi.net>, Sam Ravnborg <sam@...nborg.org>, Linux MIPS Mailing List <linux-mips@...ux-mips.org>, Ralf Baechle <ralf@...ux-mips.org>, David Daney <david.daney@...ium.com>, James Hogan <james.hogan@...s.com>, Linux-Next Mailing List <linux-next@...r.kernel.org> Subject: Re: [PATCH 2/2] kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in Makefile.lib On Thu, Nov 9, 2017 at 6:23 AM, Masahiro Yamada <yamada.masahiro@...ionext.com> wrote: > Hi James, > > > 2017-11-09 21:19 GMT+09:00 James Hogan <james@...anarts.com>: >> (resend using a working From address) >> >> <yamada.masahiro@...ionext.com> wrote: >>> If CONFIG_OF_ALL_DTBS is enabled, "make ARCH=arm64 dtbs" compiles each >>> DTB twice; one from arch/arm64/boot/dts/*/Makefile and the other from >>> the dtb-$(CONFIG_OF_ALL_DTBS) line in arch/arm64/boot/dts/Makefile. >>> It could be a race problem when building DTBS in parallel. >>> >>> Another minor issue is CONFIG_OF_ALL_DTBS covers only *.dts in vendor >>> sub-directories, so this broke when Broadcom added one more hierarchy >>> in arch/arm64/boot/dts/broadcom/<soc>/. >>> >>> One idea to fix the issues in a clean way is to move DTB handling >>> to Kbuild core scripts. Makefile.dtbinst already recognizes dtb-y >>> natively, so it should not hurt to do so. >>> >>> Add $(dtb-y) to extra-y, and $(dtb-) as well if CONFIG_OF_ALL_DTBS is >>> enabled. All clutter things in Makefiles go away. >>> >>> As a bonus clean-up, I also removed dts-dirs. Just use subdir-y >>> directly to traverse sub-directories. >>> >>> Signed-off-by: Masahiro Yamada <yamada.masahiro@...ionext.com> >> >> ... >> >>> diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile >>> index 7891ffa..b2b0d88 100644 >>> --- a/arch/mips/boot/dts/Makefile >>> +++ b/arch/mips/boot/dts/Makefile >>> @@ -1,20 +1,14 @@ >>> -dts-dirs += brcm >>> -dts-dirs += cavium-octeon >>> -dts-dirs += img >>> -dts-dirs += ingenic >>> -dts-dirs += lantiq >>> -dts-dirs += mti >>> -dts-dirs += netlogic >>> -dts-dirs += ni >>> -dts-dirs += pic32 >>> -dts-dirs += qca >>> -dts-dirs += ralink >>> -dts-dirs += xilfpga >>> +subdir-y += brcm >>> +subdir-y += cavium-octeon >>> +subdir-y += img >>> +subdir-y += ingenic >>> +subdir-y += lantiq >>> +subdir-y += mti >>> +subdir-y += netlogic >>> +subdir-y += ni >>> +subdir-y += pic32 >>> +subdir-y += qca >>> +subdir-y += ralink >>> +subdir-y += xilfpga >>> >>> -obj-y := $(addsuffix /, $(dts-dirs)) >>> - >>> -dtstree := $(srctree)/$(src) >>> -dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts))) >>> - >>> -always := $(dtb-y) >>> -subdir-y := $(dts-dirs) >>> +obj-$(BUILTIN_DTB) := $(addsuffix /, $(subdir-y)) >> >> I wonder if that should be CONFIG_BUILTIN_DTB? >> >> This is causing failures in linux-next with MIPS >> cavium_octeon_defconfig like below, and changing this line to >> CONFIG_BUILTIN_DTB seems to fix it. > > Good catch! > > > Rob, > Can you fix it to CONFIG_BUILTIN_DTB? Fixed. Rob
Powered by blists - more mailing lists