* [U-Boot] [PATCH 0/4] Let's write correct arch/*/dts/Makefile
@ 2019-03-14 5:58 Masahiro Yamada
2019-03-14 5:58 ` [U-Boot] [PATCH 1/4] ARM: fix arch/arm/dts/Makefile Masahiro Yamada
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Masahiro Yamada @ 2019-03-14 5:58 UTC (permalink / raw)
To: u-boot
Since commit 2737dfe096b6 ("kbuild: make arch-dtbs target PHONY"),
you can add whatever wrong entries in arch/*/dts/Makefile
(and you are free to not add any entry at all). Build succeeds anyway.
I have been eager to revert the harmful commit 27cb7300ffda.
I fixed all the breakage. If I did not do this now,
more and more wrong code would come in.
Travis CI tests passed.
Masahiro Yamada (4):
ARM: fix arch/arm/dts/Makefile
powerpc: fix arch/powerpc/dts/Makefile
mips: add missing dtb-y to arch/mips/dts/Makefile
Revert "Ensure device tree DTS is compiled"
arch/arm/dts/Makefile | 107 +++++++++++++++++++++++++++++++++++++++++-----
arch/mips/dts/Makefile | 5 +++
arch/powerpc/dts/Makefile | 2 +-
dts/Makefile | 13 ++----
4 files changed, 106 insertions(+), 21 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 11+ messages in thread* [U-Boot] [PATCH 1/4] ARM: fix arch/arm/dts/Makefile 2019-03-14 5:58 [U-Boot] [PATCH 0/4] Let's write correct arch/*/dts/Makefile Masahiro Yamada @ 2019-03-14 5:58 ` Masahiro Yamada 2019-03-14 6:26 ` Chris Packham 2019-03-22 23:17 ` [U-Boot] [U-Boot,1/4] " Tom Rini 2019-03-14 5:58 ` [U-Boot] [PATCH 2/4] powerpc: fix arch/powerpc/dts/Makefile Masahiro Yamada ` (2 subsequent siblings) 3 siblings, 2 replies; 11+ messages in thread From: Masahiro Yamada @ 2019-03-14 5:58 UTC (permalink / raw) To: u-boot Since commit 27cb7300ffda ("Ensure device tree DTS is compiled"), build succeeds irrespective of the correctness of Makefile. In fact, you can compile any defconfig without adding any entry in arch/*/dts/Makefile. As a result, a lot of wrong code have been merged unnoticed. I am going to revert that commit, and lots of hidden issues have come to light: [1] Typos armada-3720-uDPU.dts, sun8i-a83t-tbs-a711.dts use the extension ".dts" instead of ".dtb" [2] DTB is associated to undefined CONFIG option For example, mx6sllevk_defconfig defines CONFIG_MX6SLL, but associates its device tree to CONFIG_MX6SL, which is undefined. [3] Lots of entries are missing Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/dts/Makefile | 107 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 97 insertions(+), 10 deletions(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 2a040b2..5d2df84 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -16,6 +16,8 @@ dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \ dtb-$(CONFIG_TARGET_HIKEY) += hi6220-hikey.dtb +dtb-$(CONFIG_TARGET_POPLAR) += hi3798cv200-poplar.dtb + dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ exynos5250-snow.dtb \ exynos5250-spring.dtb \ @@ -25,10 +27,44 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ exynos5800-peach-pi.dtb \ exynos5422-odroidxu3.dtb dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb + +dtb-$(CONFIG_ARCH_DAVINCI) += \ + da850-evm.dtb \ + da850-lcdk.dtb + +dtb-$(CONFIG_KIRKWOOD) += \ + kirkwood-atl-sbx81lifkw.dtb \ + kirkwood-atl-sbx81lifxcat.dtb \ + kirkwood-blackarmor-nas220.dtb \ + kirkwood-d2net.dtb \ + kirkwood-dns325.dtb \ + kirkwood-dockstar.dtb \ + kirkwood-dreamplug.dtb \ + kirkwood-ds109.dtb \ + kirkwood-goflexnet.dtb \ + kirkwood-guruplug-server-plus.dtb \ + kirkwood-ib62x0.dtb \ + kirkwood-iconnect.dtb \ + kirkwood-is2.dtb \ + kirkwood-km_kirkwood.dtb \ + kirkwood-lsxhl.dtb \ + kirkwood-lschlv2.dtb \ + kirkwood-net2big.dtb \ + kirkwood-ns2.dtb \ + kirkwood-ns2lite.dtb \ + kirkwood-ns2max.dtb \ + kirkwood-ns2mini.dtb \ + kirkwood-pogo_e02.dtb \ + kirkwood-sheevaplug.dtb + +dtb-$(CONFIG_ARCH_OWL) += \ + bubblegum_96.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3036-sdk.dtb \ rk3128-evb.dtb \ rk3188-radxarock.dtb \ + rk3229-evb.dtb \ rk3288-evb.dtb \ rk3288-fennec.dtb \ rk3288-firefly.dtb \ @@ -50,6 +86,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3368-px5-evb.dtb \ rk3399-evb.dtb \ rk3399-firefly.dtb \ + rk3399-gru-bob.dtb \ rk3399-puma-ddr1333.dtb \ rk3399-puma-ddr1600.dtb \ rk3399-puma-ddr1866.dtb \ @@ -96,12 +133,13 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-3720-db.dtb \ armada-3720-espressobin.dtb \ armada-3720-turris-mox.dtb \ - armada-3720-uDPU.dts \ + armada-3720-uDPU.dtb \ armada-375-db.dtb \ armada-388-clearfog.dtb \ armada-388-gp.dtb \ armada-388-helios4.dtb \ armada-385-amc.dtb \ + armada-385-turris-omnia.dtb \ armada-7040-db.dtb \ armada-7040-db-nand.dtb \ armada-8040-db.dtb \ @@ -140,6 +178,7 @@ dtb-$(CONFIG_ARCH_UNIPHIER_SLD8) += \ uniphier-sld8-ref.dtb dtb-$(CONFIG_ARCH_ZYNQ) += \ + bitmain-antminer-s9.dtb \ zynq-cc108.dtb \ zynq-cse-nand.dtb \ zynq-cse-nor.dtb \ @@ -156,6 +195,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ zynq-zc706.dtb \ zynq-zc770-xm010.dtb \ zynq-zc770-xm011.dtb \ + zynq-zc770-xm011-x16.dtb \ zynq-zc770-xm012.dtb \ zynq-zc770-xm013.dtb \ zynq-zed.dtb \ @@ -192,7 +232,14 @@ dtb-$(CONFIG_ARCH_VERSAL) += \ versal-mini-emmc1.dtb dtb-$(CONFIG_ARCH_ZYNQMP_R5) += \ zynqmp-r5.dtb -dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb \ +dtb-$(CONFIG_AM33XX) += \ + am335x-baltos.dtb \ + am335x-bone.dtb \ + am335x-boneblack.dtb \ + am335x-brppt1-mmc.dtb \ + am335x-brppt1-nand.dtb \ + am335x-brppt1-spi.dtb \ + am335x-brxre1.dtb \ am335x-draco.dtb \ am335x-evm.dtb \ am335x-evmsk.dtb \ @@ -209,6 +256,7 @@ dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \ am43x-epos-evm.dtb \ am437x-idk-evm.dtb \ am4372-generic.dtb +dtb-$(CONFIG_TARGET_AM3517_EVM) += am3517-evm.dtb dtb-$(CONFIG_TI816X) += dm8168-evm.dtb dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb @@ -355,6 +403,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-olinuxino-lime2.dtb \ sun7i-a20-olinuxino-lime2-emmc.dtb \ sun7i-a20-olinuxino-micro.dtb \ + sun7i-a20-olinuxino-micro-emmc.dtb \ sun7i-a20-orangepi.dtb \ sun7i-a20-orangepi-mini.dtb \ sun7i-a20-pcduino3.dtb \ @@ -383,7 +432,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ sun8i-a83t-allwinner-h8homlet-v2.dtb \ sun8i-a83t-bananapi-m3.dtb \ sun8i-a83t-cubietruck-plus.dtb \ - sun8i-a83t-tbs-a711.dts + sun8i-a83t-tbs-a711.dtb dtb-$(CONFIG_MACH_SUN8I_H3) += \ sun8i-h2-plus-bananapi-m2-zero.dtb \ sun8i-h2-plus-libretech-all-h3-cc.dtb \ @@ -408,6 +457,7 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \ dtb-$(CONFIG_MACH_SUN8I_V3S) += \ sun8i-v3s-licheepi-zero.dtb dtb-$(CONFIG_MACH_SUN50I_H5) += \ + sun50i-h5-bananapi-m2-plus.dtb \ sun50i-h5-emlid-neutis-n5-devboard.dtb \ sun50i-h5-libretech-all-h3-cc.dtb \ sun50i-h5-nanopi-neo2.dtb \ @@ -426,6 +476,7 @@ dtb-$(CONFIG_MACH_SUN50I) += \ sun50i-a64-nanopi-a64.dtb \ sun50i-a64-olinuxino.dtb \ sun50i-a64-orangepi-win.dtb \ + sun50i-a64-pine64-lts.dtb \ sun50i-a64-pine64-plus.dtb \ sun50i-a64-pine64.dtb \ sun50i-a64-pinebook.dtb \ @@ -441,7 +492,12 @@ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ pcm052.dtb \ bk4r1.dtb -dtb-$(CONFIG_MX53) += imx53-cx9020.dtb +dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \ + imx53-kp.dtb + +dtb-$(CONFIG_MX6Q) += \ + imx6q-display5.dtb \ + imx6q-logicpd.dtb dtb-$(CONFIG_MX6QDL) += \ imx6dl-icore.dtb \ @@ -452,7 +508,6 @@ dtb-$(CONFIG_MX6QDL) += \ imx6q-icore.dtb \ imx6q-icore-mipi.dtb \ imx6q-icore-rqs.dtb \ - imx6q-logicpd.dtb \ imx6q-sabreauto.dtb \ imx6q-sabresd.dtb \ imx6dl-sabreauto.dtb \ @@ -462,7 +517,7 @@ dtb-$(CONFIG_MX6QDL) += \ dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb -dtb-$(CONFIG_MX6SL) += imx6sll-evk.dtb +dtb-$(CONFIG_MX6SLL) += imx6sll-evk.dtb dtb-$(CONFIG_MX6SX) += \ imx6sx-sabreauto.dtb \ @@ -479,10 +534,15 @@ dtb-$(CONFIG_MX6UL) += \ imx6ul-liteboard.dtb \ imx6ul-phycore-segin.dtb -dtb-$(CONFIG_MX6ULL) += imx6ull-14x14-evk.dtb +dtb-$(CONFIG_MX6ULL) += \ + imx6ull-14x14-evk.dtb \ + imx6ull-colibri.dtb \ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \ - imx7d-sdb-qspi.dtb + imx7d-sdb-qspi.dtb \ + imx7-colibri-emmc.dtb \ + imx7-colibri-rawnand.dtb \ + imx7s-warp.dtb dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb @@ -490,6 +550,16 @@ dtb-$(CONFIG_ARCH_IMX8) += fsl-imx8qxp-mek.dtb dtb-$(CONFIG_ARCH_IMX8M) += fsl-imx8mq-evk.dtb +dtb-$(CONFIG_RCAR_GEN2) += \ + r8a7790-lager-u-boot.dtb \ + r8a7790-stout-u-boot.dtb \ + r8a7791-koelsch-u-boot.dtb \ + r8a7791-porter-u-boot.dtb \ + r8a7792-blanche-u-boot.dtb \ + r8a7793-gose-u-boot.dtb \ + r8a7794-alt-u-boot.dtb \ + r8a7794-silk-u-boot.dtb + dtb-$(CONFIG_RCAR_GEN3) += \ r8a7795-h3ulcb-u-boot.dtb \ r8a7795-salvator-x-u-boot.dtb \ @@ -509,8 +579,12 @@ dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \ dtb-$(CONFIG_TARGET_AT91SAM9261EK) += at91sam9261ek.dtb +dtb-$(CONFIG_TARGET_PM9261) += at91sam9261ek.dtb + dtb-$(CONFIG_TARGET_PM9263) += at91sam9263ek.dtb +dtb-$(CONFIG_TARGET_MEESC) += at91sam9263ek.dtb + dtb-$(CONFIG_TARGET_AT91SAM9263EK) += at91sam9263ek.dtb dtb-$(CONFIG_TARGET_AT91SAM9RLEK) += at91sam9rlek.dtb @@ -531,9 +605,15 @@ dtb-$(CONFIG_TARGET_AT91SAM9X5EK) += \ dtb-$(CONFIG_TARGET_AT91SAM9N12EK) += at91sam9n12ek.dtb +dtb-$(CONFIG_TARGET_ETHERNUT5) += ethernut5.dtb + +dtb-$(CONFIG_TARGET_USB_A9263) += usb_a9263.dtb + dtb-$(CONFIG_TARGET_OMAP3_LOGIC) += \ - logicpd-torpedo-37xx-devkit.dtb \ - logicpd-som-lv-37xx-devkit.dtb + logicpd-som-lv-35xx-devkit.dtb \ + logicpd-som-lv-37xx-devkit.dtb \ + logicpd-torpedo-35xx-devkit.dtb \ + logicpd-torpedo-37xx-devkit.dtb dtb-$(CONFIG_TARGET_OMAP3_EVM) += \ omap3-evm-37xx.dtb \ @@ -582,9 +662,16 @@ dtb-$(CONFIG_ARCH_BCM283X) += \ bcm2835-rpi-b-plus.dtb \ bcm2835-rpi-b-rev2.dtb \ bcm2835-rpi-b.dtb \ + bcm2835-rpi-zero-w.dtb \ bcm2836-rpi-2-b.dtb \ bcm2837-rpi-3-b.dtb +dtb-$(CONFIG_ARCH_BCM63158) += \ + bcm963158.dtb + +dtb-$(CONFIG_ARCH_BCM6858) += \ + bcm968580xref.dtb + dtb-$(CONFIG_ARCH_ASPEED) += ast2500-evb.dtb dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 1/4] ARM: fix arch/arm/dts/Makefile 2019-03-14 5:58 ` [U-Boot] [PATCH 1/4] ARM: fix arch/arm/dts/Makefile Masahiro Yamada @ 2019-03-14 6:26 ` Chris Packham 2019-03-22 23:17 ` [U-Boot] [U-Boot,1/4] " Tom Rini 1 sibling, 0 replies; 11+ messages in thread From: Chris Packham @ 2019-03-14 6:26 UTC (permalink / raw) To: u-boot On Thu, 14 Mar 2019, 6:59 PM Masahiro Yamada, <yamada.masahiro@socionext.com> wrote: > Since commit 27cb7300ffda ("Ensure device tree DTS is compiled"), > build succeeds irrespective of the correctness of Makefile. > > In fact, you can compile any defconfig without adding any entry in > arch/*/dts/Makefile. > > As a result, a lot of wrong code have been merged unnoticed. > > I am going to revert that commit, and lots of hidden issues have > come to light: > > [1] Typos > > armada-3720-uDPU.dts, sun8i-a83t-tbs-a711.dts > > use the extension ".dts" instead of ".dtb" > > [2] DTB is associated to undefined CONFIG option > > For example, mx6sllevk_defconfig defines CONFIG_MX6SLL, but > associates its device tree to CONFIG_MX6SL, which is undefined. > > [3] Lots of entries are missing > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > I'm surprised I didn't notice the missing kirkwood ones. Reviewed-by: Chris Packham <judge.packham@gmail.com> (p.s. this is from the gmail app and it's been known to upset patchwork, watch out for rogue html) --- > > arch/arm/dts/Makefile | 107 > +++++++++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 97 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 2a040b2..5d2df84 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -16,6 +16,8 @@ dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \ > > dtb-$(CONFIG_TARGET_HIKEY) += hi6220-hikey.dtb > > +dtb-$(CONFIG_TARGET_POPLAR) += hi3798cv200-poplar.dtb > + > dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ > exynos5250-snow.dtb \ > exynos5250-spring.dtb \ > @@ -25,10 +27,44 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ > exynos5800-peach-pi.dtb \ > exynos5422-odroidxu3.dtb > dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb > + > +dtb-$(CONFIG_ARCH_DAVINCI) += \ > + da850-evm.dtb \ > + da850-lcdk.dtb > + > +dtb-$(CONFIG_KIRKWOOD) += \ > + kirkwood-atl-sbx81lifkw.dtb \ > + kirkwood-atl-sbx81lifxcat.dtb \ > + kirkwood-blackarmor-nas220.dtb \ > + kirkwood-d2net.dtb \ > + kirkwood-dns325.dtb \ > + kirkwood-dockstar.dtb \ > + kirkwood-dreamplug.dtb \ > + kirkwood-ds109.dtb \ > + kirkwood-goflexnet.dtb \ > + kirkwood-guruplug-server-plus.dtb \ > + kirkwood-ib62x0.dtb \ > + kirkwood-iconnect.dtb \ > + kirkwood-is2.dtb \ > + kirkwood-km_kirkwood.dtb \ > + kirkwood-lsxhl.dtb \ > + kirkwood-lschlv2.dtb \ > + kirkwood-net2big.dtb \ > + kirkwood-ns2.dtb \ > + kirkwood-ns2lite.dtb \ > + kirkwood-ns2max.dtb \ > + kirkwood-ns2mini.dtb \ > + kirkwood-pogo_e02.dtb \ > + kirkwood-sheevaplug.dtb > + > +dtb-$(CONFIG_ARCH_OWL) += \ > + bubblegum_96.dtb > + > dtb-$(CONFIG_ARCH_ROCKCHIP) += \ > rk3036-sdk.dtb \ > rk3128-evb.dtb \ > rk3188-radxarock.dtb \ > + rk3229-evb.dtb \ > rk3288-evb.dtb \ > rk3288-fennec.dtb \ > rk3288-firefly.dtb \ > @@ -50,6 +86,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ > rk3368-px5-evb.dtb \ > rk3399-evb.dtb \ > rk3399-firefly.dtb \ > + rk3399-gru-bob.dtb \ > rk3399-puma-ddr1333.dtb \ > rk3399-puma-ddr1600.dtb \ > rk3399-puma-ddr1866.dtb \ > @@ -96,12 +133,13 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ > armada-3720-db.dtb \ > armada-3720-espressobin.dtb \ > armada-3720-turris-mox.dtb \ > - armada-3720-uDPU.dts \ > + armada-3720-uDPU.dtb \ > armada-375-db.dtb \ > armada-388-clearfog.dtb \ > armada-388-gp.dtb \ > armada-388-helios4.dtb \ > armada-385-amc.dtb \ > + armada-385-turris-omnia.dtb \ > armada-7040-db.dtb \ > armada-7040-db-nand.dtb \ > armada-8040-db.dtb \ > @@ -140,6 +178,7 @@ dtb-$(CONFIG_ARCH_UNIPHIER_SLD8) += \ > uniphier-sld8-ref.dtb > > dtb-$(CONFIG_ARCH_ZYNQ) += \ > + bitmain-antminer-s9.dtb \ > zynq-cc108.dtb \ > zynq-cse-nand.dtb \ > zynq-cse-nor.dtb \ > @@ -156,6 +195,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ > zynq-zc706.dtb \ > zynq-zc770-xm010.dtb \ > zynq-zc770-xm011.dtb \ > + zynq-zc770-xm011-x16.dtb \ > zynq-zc770-xm012.dtb \ > zynq-zc770-xm013.dtb \ > zynq-zed.dtb \ > @@ -192,7 +232,14 @@ dtb-$(CONFIG_ARCH_VERSAL) += \ > versal-mini-emmc1.dtb > dtb-$(CONFIG_ARCH_ZYNQMP_R5) += \ > zynqmp-r5.dtb > -dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb \ > +dtb-$(CONFIG_AM33XX) += \ > + am335x-baltos.dtb \ > + am335x-bone.dtb \ > + am335x-boneblack.dtb \ > + am335x-brppt1-mmc.dtb \ > + am335x-brppt1-nand.dtb \ > + am335x-brppt1-spi.dtb \ > + am335x-brxre1.dtb \ > am335x-draco.dtb \ > am335x-evm.dtb \ > am335x-evmsk.dtb \ > @@ -209,6 +256,7 @@ dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb > am437x-sk-evm.dtb \ > am43x-epos-evm.dtb \ > am437x-idk-evm.dtb \ > am4372-generic.dtb > +dtb-$(CONFIG_TARGET_AM3517_EVM) += am3517-evm.dtb > dtb-$(CONFIG_TI816X) += dm8168-evm.dtb > dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb > > @@ -355,6 +403,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ > sun7i-a20-olinuxino-lime2.dtb \ > sun7i-a20-olinuxino-lime2-emmc.dtb \ > sun7i-a20-olinuxino-micro.dtb \ > + sun7i-a20-olinuxino-micro-emmc.dtb \ > sun7i-a20-orangepi.dtb \ > sun7i-a20-orangepi-mini.dtb \ > sun7i-a20-pcduino3.dtb \ > @@ -383,7 +432,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ > sun8i-a83t-allwinner-h8homlet-v2.dtb \ > sun8i-a83t-bananapi-m3.dtb \ > sun8i-a83t-cubietruck-plus.dtb \ > - sun8i-a83t-tbs-a711.dts > + sun8i-a83t-tbs-a711.dtb > dtb-$(CONFIG_MACH_SUN8I_H3) += \ > sun8i-h2-plus-bananapi-m2-zero.dtb \ > sun8i-h2-plus-libretech-all-h3-cc.dtb \ > @@ -408,6 +457,7 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \ > dtb-$(CONFIG_MACH_SUN8I_V3S) += \ > sun8i-v3s-licheepi-zero.dtb > dtb-$(CONFIG_MACH_SUN50I_H5) += \ > + sun50i-h5-bananapi-m2-plus.dtb \ > sun50i-h5-emlid-neutis-n5-devboard.dtb \ > sun50i-h5-libretech-all-h3-cc.dtb \ > sun50i-h5-nanopi-neo2.dtb \ > @@ -426,6 +476,7 @@ dtb-$(CONFIG_MACH_SUN50I) += \ > sun50i-a64-nanopi-a64.dtb \ > sun50i-a64-olinuxino.dtb \ > sun50i-a64-orangepi-win.dtb \ > + sun50i-a64-pine64-lts.dtb \ > sun50i-a64-pine64-plus.dtb \ > sun50i-a64-pine64.dtb \ > sun50i-a64-pinebook.dtb \ > @@ -441,7 +492,12 @@ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ > pcm052.dtb \ > bk4r1.dtb > > -dtb-$(CONFIG_MX53) += imx53-cx9020.dtb > +dtb-$(CONFIG_MX53) += imx53-cx9020.dtb \ > + imx53-kp.dtb > + > +dtb-$(CONFIG_MX6Q) += \ > + imx6q-display5.dtb \ > + imx6q-logicpd.dtb > > dtb-$(CONFIG_MX6QDL) += \ > imx6dl-icore.dtb \ > @@ -452,7 +508,6 @@ dtb-$(CONFIG_MX6QDL) += \ > imx6q-icore.dtb \ > imx6q-icore-mipi.dtb \ > imx6q-icore-rqs.dtb \ > - imx6q-logicpd.dtb \ > imx6q-sabreauto.dtb \ > imx6q-sabresd.dtb \ > imx6dl-sabreauto.dtb \ > @@ -462,7 +517,7 @@ dtb-$(CONFIG_MX6QDL) += \ > > dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb > > -dtb-$(CONFIG_MX6SL) += imx6sll-evk.dtb > +dtb-$(CONFIG_MX6SLL) += imx6sll-evk.dtb > > dtb-$(CONFIG_MX6SX) += \ > imx6sx-sabreauto.dtb \ > @@ -479,10 +534,15 @@ dtb-$(CONFIG_MX6UL) += \ > imx6ul-liteboard.dtb \ > imx6ul-phycore-segin.dtb > > -dtb-$(CONFIG_MX6ULL) += imx6ull-14x14-evk.dtb > +dtb-$(CONFIG_MX6ULL) += \ > + imx6ull-14x14-evk.dtb \ > + imx6ull-colibri.dtb \ > > dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \ > - imx7d-sdb-qspi.dtb > + imx7d-sdb-qspi.dtb \ > + imx7-colibri-emmc.dtb \ > + imx7-colibri-rawnand.dtb \ > + imx7s-warp.dtb > > dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb > > @@ -490,6 +550,16 @@ dtb-$(CONFIG_ARCH_IMX8) += fsl-imx8qxp-mek.dtb > > dtb-$(CONFIG_ARCH_IMX8M) += fsl-imx8mq-evk.dtb > > +dtb-$(CONFIG_RCAR_GEN2) += \ > + r8a7790-lager-u-boot.dtb \ > + r8a7790-stout-u-boot.dtb \ > + r8a7791-koelsch-u-boot.dtb \ > + r8a7791-porter-u-boot.dtb \ > + r8a7792-blanche-u-boot.dtb \ > + r8a7793-gose-u-boot.dtb \ > + r8a7794-alt-u-boot.dtb \ > + r8a7794-silk-u-boot.dtb > + > dtb-$(CONFIG_RCAR_GEN3) += \ > r8a7795-h3ulcb-u-boot.dtb \ > r8a7795-salvator-x-u-boot.dtb \ > @@ -509,8 +579,12 @@ dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \ > > dtb-$(CONFIG_TARGET_AT91SAM9261EK) += at91sam9261ek.dtb > > +dtb-$(CONFIG_TARGET_PM9261) += at91sam9261ek.dtb > + > dtb-$(CONFIG_TARGET_PM9263) += at91sam9263ek.dtb > > +dtb-$(CONFIG_TARGET_MEESC) += at91sam9263ek.dtb > + > dtb-$(CONFIG_TARGET_AT91SAM9263EK) += at91sam9263ek.dtb > > dtb-$(CONFIG_TARGET_AT91SAM9RLEK) += at91sam9rlek.dtb > @@ -531,9 +605,15 @@ dtb-$(CONFIG_TARGET_AT91SAM9X5EK) += \ > > dtb-$(CONFIG_TARGET_AT91SAM9N12EK) += at91sam9n12ek.dtb > > +dtb-$(CONFIG_TARGET_ETHERNUT5) += ethernut5.dtb > + > +dtb-$(CONFIG_TARGET_USB_A9263) += usb_a9263.dtb > + > dtb-$(CONFIG_TARGET_OMAP3_LOGIC) += \ > - logicpd-torpedo-37xx-devkit.dtb \ > - logicpd-som-lv-37xx-devkit.dtb > + logicpd-som-lv-35xx-devkit.dtb \ > + logicpd-som-lv-37xx-devkit.dtb \ > + logicpd-torpedo-35xx-devkit.dtb \ > + logicpd-torpedo-37xx-devkit.dtb > > dtb-$(CONFIG_TARGET_OMAP3_EVM) += \ > omap3-evm-37xx.dtb \ > @@ -582,9 +662,16 @@ dtb-$(CONFIG_ARCH_BCM283X) += \ > bcm2835-rpi-b-plus.dtb \ > bcm2835-rpi-b-rev2.dtb \ > bcm2835-rpi-b.dtb \ > + bcm2835-rpi-zero-w.dtb \ > bcm2836-rpi-2-b.dtb \ > bcm2837-rpi-3-b.dtb > > +dtb-$(CONFIG_ARCH_BCM63158) += \ > + bcm963158.dtb > + > +dtb-$(CONFIG_ARCH_BCM6858) += \ > + bcm968580xref.dtb > + > dtb-$(CONFIG_ARCH_ASPEED) += ast2500-evb.dtb > > dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb > -- > 2.7.4 > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > https://lists.denx.de/listinfo/u-boot > ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [U-Boot,1/4] ARM: fix arch/arm/dts/Makefile 2019-03-14 5:58 ` [U-Boot] [PATCH 1/4] ARM: fix arch/arm/dts/Makefile Masahiro Yamada 2019-03-14 6:26 ` Chris Packham @ 2019-03-22 23:17 ` Tom Rini 1 sibling, 0 replies; 11+ messages in thread From: Tom Rini @ 2019-03-22 23:17 UTC (permalink / raw) To: u-boot On Thu, Mar 14, 2019 at 02:58:33PM +0900, Masahiro Yamada wrote: > Since commit 27cb7300ffda ("Ensure device tree DTS is compiled"), > build succeeds irrespective of the correctness of Makefile. > > In fact, you can compile any defconfig without adding any entry in > arch/*/dts/Makefile. > > As a result, a lot of wrong code have been merged unnoticed. > > I am going to revert that commit, and lots of hidden issues have > come to light: > > [1] Typos > > armada-3720-uDPU.dts, sun8i-a83t-tbs-a711.dts > > use the extension ".dts" instead of ".dtb" > > [2] DTB is associated to undefined CONFIG option > > For example, mx6sllevk_defconfig defines CONFIG_MX6SLL, but > associates its device tree to CONFIG_MX6SL, which is undefined. > > [3] Lots of entries are missing > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Reviewed-by: Chris Packham <judge.packham@gmail.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190322/ff8a23a2/attachment.sig> ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 2/4] powerpc: fix arch/powerpc/dts/Makefile 2019-03-14 5:58 [U-Boot] [PATCH 0/4] Let's write correct arch/*/dts/Makefile Masahiro Yamada 2019-03-14 5:58 ` [U-Boot] [PATCH 1/4] ARM: fix arch/arm/dts/Makefile Masahiro Yamada @ 2019-03-14 5:58 ` Masahiro Yamada 2019-03-22 23:17 ` [U-Boot] [U-Boot,2/4] " Tom Rini 2019-03-14 5:58 ` [U-Boot] [PATCH 3/4] mips: add missing dtb-y to arch/mips/dts/Makefile Masahiro Yamada 2019-03-14 5:58 ` [U-Boot] [PATCH 4/4] Revert "Ensure device tree DTS is compiled" Masahiro Yamada 3 siblings, 1 reply; 11+ messages in thread From: Masahiro Yamada @ 2019-03-14 5:58 UTC (permalink / raw) To: u-boot Since commit 27cb7300ffda ("Ensure device tree DTS is compiled"), build succeeds irrespective of the correctness of Makefile. I am going to revert that commit, so wrong code must be fixed. CONFIG_MCR3000 is not defined anywhere. CONFIG_TARGET_MCR3000 is the correct one. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/powerpc/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/dts/Makefile b/arch/powerpc/dts/Makefile index 172bed4..f080a96 100644 --- a/arch/powerpc/dts/Makefile +++ b/arch/powerpc/dts/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ dtb-$(CONFIG_TARGET_T2080QDS) += t2080qds.dtb -dtb-$(CONFIG_MCR3000) += mcr3000.dtb +dtb-$(CONFIG_TARGET_MCR3000) += mcr3000.dtb targets += $(dtb-y) -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [U-Boot,2/4] powerpc: fix arch/powerpc/dts/Makefile 2019-03-14 5:58 ` [U-Boot] [PATCH 2/4] powerpc: fix arch/powerpc/dts/Makefile Masahiro Yamada @ 2019-03-22 23:17 ` Tom Rini 0 siblings, 0 replies; 11+ messages in thread From: Tom Rini @ 2019-03-22 23:17 UTC (permalink / raw) To: u-boot On Thu, Mar 14, 2019 at 02:58:34PM +0900, Masahiro Yamada wrote: > Since commit 27cb7300ffda ("Ensure device tree DTS is compiled"), > build succeeds irrespective of the correctness of Makefile. > > I am going to revert that commit, so wrong code must be fixed. > > CONFIG_MCR3000 is not defined anywhere. CONFIG_TARGET_MCR3000 is the > correct one. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190322/386af9c6/attachment.sig> ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/4] mips: add missing dtb-y to arch/mips/dts/Makefile 2019-03-14 5:58 [U-Boot] [PATCH 0/4] Let's write correct arch/*/dts/Makefile Masahiro Yamada 2019-03-14 5:58 ` [U-Boot] [PATCH 1/4] ARM: fix arch/arm/dts/Makefile Masahiro Yamada 2019-03-14 5:58 ` [U-Boot] [PATCH 2/4] powerpc: fix arch/powerpc/dts/Makefile Masahiro Yamada @ 2019-03-14 5:58 ` Masahiro Yamada 2019-03-15 11:11 ` Daniel Schwierzeck 2019-03-22 23:18 ` [U-Boot] [U-Boot, " Tom Rini 2019-03-14 5:58 ` [U-Boot] [PATCH 4/4] Revert "Ensure device tree DTS is compiled" Masahiro Yamada 3 siblings, 2 replies; 11+ messages in thread From: Masahiro Yamada @ 2019-03-14 5:58 UTC (permalink / raw) To: u-boot Since commit 27cb7300ffda ("Ensure device tree DTS is compiled"), build succeeds irrespective of the correctness of Makefile. In fact, you can compile any defconfig without adding any entry in arch/*/dts/Makefile. I am going to revert that commit, so device tree must be explicitly listed in Makefile. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/mips/dts/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile index b94b582..665d3cc 100644 --- a/arch/mips/dts/Makefile +++ b/arch/mips/dts/Makefile @@ -1,5 +1,8 @@ # SPDX-License-Identifier: GPL-2.0+ +dtb-$(CONFIG_ARCH_MT7620) += \ + gardena-smart-gateway-mt7688.dtb \ + linkit-smart-7688.dtb dtb-$(CONFIG_TARGET_AP121) += ap121.dtb dtb-$(CONFIG_TARGET_AP143) += ap143.dtb dtb-$(CONFIG_TARGET_BOSTON) += img,boston.dtb @@ -17,6 +20,8 @@ dtb-$(CONFIG_BOARD_NETGEAR_DGND3700V2) += netgear,dgnd3700v2.dtb dtb-$(CONFIG_BOARD_SAGEM_FAST1704) += sagem,f at st1704.dtb dtb-$(CONFIG_BOARD_TPLINK_WDR4300) += tplink_wdr4300.dtb dtb-$(CONFIG_TARGET_JZ4780_CI20) += ci20.dtb +dtb-$(CONFIG_SOC_BMIPS_BCM6358) += sfr,nb4-ser.dtb +dtb-$(CONFIG_SOC_BMIPS_BCM6838) += brcm,bcm968380gerg.dtb dtb-$(CONFIG_SOC_LUTON) += luton_pcb090.dtb luton_pcb091.dtb dtb-$(CONFIG_SOC_OCELOT) += ocelot_pcb120.dtb ocelot_pcb123.dtb dtb-$(CONFIG_SOC_JR2) += jr2_pcb110.dtb jr2_pcb111.dtb serval2_pcb112.dtb -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 3/4] mips: add missing dtb-y to arch/mips/dts/Makefile 2019-03-14 5:58 ` [U-Boot] [PATCH 3/4] mips: add missing dtb-y to arch/mips/dts/Makefile Masahiro Yamada @ 2019-03-15 11:11 ` Daniel Schwierzeck 2019-03-22 23:18 ` [U-Boot] [U-Boot, " Tom Rini 1 sibling, 0 replies; 11+ messages in thread From: Daniel Schwierzeck @ 2019-03-15 11:11 UTC (permalink / raw) To: u-boot Am 14.03.19 um 06:58 schrieb Masahiro Yamada: > Since commit 27cb7300ffda ("Ensure device tree DTS is compiled"), > build succeeds irrespective of the correctness of Makefile. > > In fact, you can compile any defconfig without adding any entry in > arch/*/dts/Makefile. > > I am going to revert that commit, so device tree must be explicitly > listed in Makefile. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > arch/mips/dts/Makefile | 5 +++++ > 1 file changed, 5 insertions(+) > Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> -- - Daniel ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [U-Boot, 3/4] mips: add missing dtb-y to arch/mips/dts/Makefile 2019-03-14 5:58 ` [U-Boot] [PATCH 3/4] mips: add missing dtb-y to arch/mips/dts/Makefile Masahiro Yamada 2019-03-15 11:11 ` Daniel Schwierzeck @ 2019-03-22 23:18 ` Tom Rini 1 sibling, 0 replies; 11+ messages in thread From: Tom Rini @ 2019-03-22 23:18 UTC (permalink / raw) To: u-boot On Thu, Mar 14, 2019 at 02:58:35PM +0900, Masahiro Yamada wrote: > Since commit 27cb7300ffda ("Ensure device tree DTS is compiled"), > build succeeds irrespective of the correctness of Makefile. > > In fact, you can compile any defconfig without adding any entry in > arch/*/dts/Makefile. > > I am going to revert that commit, so device tree must be explicitly > listed in Makefile. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190322/4e2c5a42/attachment.sig> ^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH 4/4] Revert "Ensure device tree DTS is compiled" 2019-03-14 5:58 [U-Boot] [PATCH 0/4] Let's write correct arch/*/dts/Makefile Masahiro Yamada ` (2 preceding siblings ...) 2019-03-14 5:58 ` [U-Boot] [PATCH 3/4] mips: add missing dtb-y to arch/mips/dts/Makefile Masahiro Yamada @ 2019-03-14 5:58 ` Masahiro Yamada 2019-03-22 23:18 ` [U-Boot] [U-Boot, " Tom Rini 3 siblings, 1 reply; 11+ messages in thread From: Masahiro Yamada @ 2019-03-14 5:58 UTC (permalink / raw) To: u-boot This reverts commit 27cb7300ffda7a3f1581f0f5a2d3bfe59b97ad67. I am not sure if I correctly understood the log of commit 27cb7300ffda ("Ensure device tree DTS is compiled"), but the code-diff looks like it was trying to solve the missed re-compilation when .dts was modified. Recently, commit 2737dfe096b6 ("kbuild: make arch-dtbs target PHONY") fixed the issue in a more correct and more complete way. Anyway, since the former commit, we see a clumsy log like this: make[2]: 'arch/sandbox/dts/sandbox.dtb' is up to date Another problem is, it created multiple paths to descend into arch/*/dts/, causing a race in parallel building. So, let's revert it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- dts/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dts/Makefile b/dts/Makefile index 4970223..1f83e61 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -10,14 +10,10 @@ ifeq ($(DEVICE_TREE),) DEVICE_TREE := unset endif -ARCH_PATH := arch/$(ARCH)/dts -dtb_depends := arch-dtbs - ifneq ($(EXT_DTB),) DTB := $(EXT_DTB) else -DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb -dtb_depends += $(DTB:.dtb=.dts) +DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb endif $(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE @@ -28,10 +24,7 @@ $(obj)/dt.dtb: $(DTB) FORCE targets += dt.dtb dt-spl.dtb -$(DTB): $(dtb_depends) -ifeq ($(EXT_DTB),) - $(Q)$(MAKE) $(build)=$(ARCH_PATH) $@ -endif +$(DTB): arch-dtbs $(Q)test -e $@ || ( \ echo >&2; \ echo >&2 "Device Tree Source is not correctly specified."; \ @@ -42,7 +35,7 @@ endif PHONY += arch-dtbs arch-dtbs: - $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs + $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs ifeq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o -- 2.7.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [U-Boot, 4/4] Revert "Ensure device tree DTS is compiled" 2019-03-14 5:58 ` [U-Boot] [PATCH 4/4] Revert "Ensure device tree DTS is compiled" Masahiro Yamada @ 2019-03-22 23:18 ` Tom Rini 0 siblings, 0 replies; 11+ messages in thread From: Tom Rini @ 2019-03-22 23:18 UTC (permalink / raw) To: u-boot On Thu, Mar 14, 2019 at 02:58:36PM +0900, Masahiro Yamada wrote: > This reverts commit 27cb7300ffda7a3f1581f0f5a2d3bfe59b97ad67. > > I am not sure if I correctly understood the log of commit 27cb7300ffda > ("Ensure device tree DTS is compiled"), but the code-diff looks like > it was trying to solve the missed re-compilation when .dts was modified. > > Recently, commit 2737dfe096b6 ("kbuild: make arch-dtbs target PHONY") > fixed the issue in a more correct and more complete way. > > Anyway, since the former commit, we see a clumsy log like this: > > make[2]: 'arch/sandbox/dts/sandbox.dtb' is up to date > > Another problem is, it created multiple paths to descend into > arch/*/dts/, causing a race in parallel building. > > So, let's revert it. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190322/b5a8ba3c/attachment.sig> ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-03-22 23:18 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-03-14 5:58 [U-Boot] [PATCH 0/4] Let's write correct arch/*/dts/Makefile Masahiro Yamada 2019-03-14 5:58 ` [U-Boot] [PATCH 1/4] ARM: fix arch/arm/dts/Makefile Masahiro Yamada 2019-03-14 6:26 ` Chris Packham 2019-03-22 23:17 ` [U-Boot] [U-Boot,1/4] " Tom Rini 2019-03-14 5:58 ` [U-Boot] [PATCH 2/4] powerpc: fix arch/powerpc/dts/Makefile Masahiro Yamada 2019-03-22 23:17 ` [U-Boot] [U-Boot,2/4] " Tom Rini 2019-03-14 5:58 ` [U-Boot] [PATCH 3/4] mips: add missing dtb-y to arch/mips/dts/Makefile Masahiro Yamada 2019-03-15 11:11 ` Daniel Schwierzeck 2019-03-22 23:18 ` [U-Boot] [U-Boot, " Tom Rini 2019-03-14 5:58 ` [U-Boot] [PATCH 4/4] Revert "Ensure device tree DTS is compiled" Masahiro Yamada 2019-03-22 23:18 ` [U-Boot] [U-Boot, " Tom Rini
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.