Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e7962dd authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Rob Herring
Browse files

kbuild: handle dtb-y and CONFIG_OF_ALL_DTBS natively in Makefile.lib 



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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
[robh: corrected BUILTIN_DTB to CONFIG_BUILTIN_DTB]
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 3cad14d5

arch/arc/boot/dts/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ dtb-y := $(builtindtb-y).dtb 


.SECONDARY: $(obj)/$(builtindtb-y).dtb.S



# for CONFIG_OF_ALL_DTBS test

dtstree	:= $(srctree)/$(src)

dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))



always := $(dtb-y)
 
dtb-	:= $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))

arch/arm/boot/dts/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -1069,8 +1069,3 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \ 
	aspeed-bmc-opp-romulus.dtb \

	aspeed-ast2500-evb.dtb

endif
 


dtstree		:= $(srctree)/$(src)

dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))



always		:= $(dtb-y)

arch/arm64/boot/dts/Makefile

+25 −33
Original line number Diff line number Diff line 
dts-dirs += actions

dts-dirs += al

dts-dirs += allwinner

dts-dirs += altera

dts-dirs += amd

dts-dirs += amlogic

dts-dirs += apm

dts-dirs += arm

dts-dirs += broadcom

dts-dirs += cavium

dts-dirs += exynos

dts-dirs += freescale

dts-dirs += hisilicon

dts-dirs += marvell

dts-dirs += mediatek

dts-dirs += nvidia

dts-dirs += qcom

dts-dirs += realtek

dts-dirs += renesas

dts-dirs += rockchip

dts-dirs += socionext

dts-dirs += sprd

dts-dirs += xilinx

dts-dirs += lg

dts-dirs += zte



subdir-y	:= $(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 += actions

subdir-y += al

subdir-y += allwinner

subdir-y += altera

subdir-y += amd

subdir-y += amlogic

subdir-y += apm

subdir-y += arm

subdir-y += broadcom

subdir-y += cavium

subdir-y += exynos

subdir-y += freescale

subdir-y += hisilicon

subdir-y += marvell

subdir-y += mediatek

subdir-y += nvidia

subdir-y += qcom

subdir-y += realtek

subdir-y += renesas

subdir-y += rockchip

subdir-y += socionext

subdir-y += sprd

subdir-y += xilinx

subdir-y += lg

subdir-y += zte

arch/arm64/boot/dts/actions/Makefile

+0 −3
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_ACTIONS) += s900-bubblegum-96.dtb
 


always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/al/Makefile

+0 −3
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_ALPINE)	+= alpine-v2-evp.dtb
 


always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)