7e7962dd1a
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@socionext.com> Acked-by: Arnd Bergmann <arnd@arndb.de> [robh: corrected BUILTIN_DTB to CONFIG_BUILTIN_DTB] Signed-off-by: Rob Herring <robh@kernel.org> |
||
---|---|---|
.. | ||
apq8016-sbc-pmic-pins.dtsi | ||
apq8016-sbc-soc-pins.dtsi | ||
apq8016-sbc.dts | ||
apq8016-sbc.dtsi | ||
apq8096-db820c-pins.dtsi | ||
apq8096-db820c-pmic-pins.dtsi | ||
apq8096-db820c.dts | ||
apq8096-db820c.dtsi | ||
ipq8074-hk01.dts | ||
ipq8074.dtsi | ||
Makefile | ||
msm8916-mtp.dts | ||
msm8916-mtp.dtsi | ||
msm8916-pins.dtsi | ||
msm8916.dtsi | ||
msm8992-bullhead-rev-101.dts | ||
msm8992-pins.dtsi | ||
msm8992.dtsi | ||
msm8994-angler-rev-101.dts | ||
msm8994-pins.dtsi | ||
msm8994.dtsi | ||
msm8996-mtp.dts | ||
msm8996-mtp.dtsi | ||
msm8996-pins.dtsi | ||
msm8996.dtsi | ||
pm8004.dtsi | ||
pm8916.dtsi | ||
pm8994.dtsi | ||
pmi8994.dtsi |