[U-Boot] Revert "Ensure device tree DTS is compiled"

From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] Revert "Ensure device tree DTS is compiled"
Date: Sun, 10 Mar 2019 01:07:48 +0900	[thread overview]
Message-ID: <CAK7LNATvy-7vQEUQ32RT=Ti=BqF-+CifZd7Z=gFeVd=NYzJYqQ@mail.gmail.com> (raw)
In-Reply-To: <20190308230339.GA29931@bill-the-cat>

Hi Tom,


On Sat, Mar 9, 2019 at 8:04 AM Tom Rini <trini@konsulko.com> wrote:
>
> On Thu, Mar 07, 2019 at 11:13:52PM +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
> >
> > So, let's revert it.
> >
> > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> This causes tons of breakage like:
>        arm:  +   rpi_0_w
> +(rpi_0_w)
> +(rpi_0_w) Device Tree Source is not correctly specified.
> +(rpi_0_w) Please define 'CONFIG_DEFAULT_DEVICE_TREE'
> +(rpi_0_w) or build with 'DEVICE_TREE=<device_tree>' argument
> +(rpi_0_w) make[2]: *** [arch/arm/dts/bcm2835-rpi-zero-w.dtb] Error 1
> +(rpi_0_w) make[1]: *** [dts] Error 2
> +(rpi_0_w) make: *** [sub-make] Error 2
>


This is because arch/arm/dts/Makefile
has no entry for bcm2835-rpi-zero-w.dtb.




The following patch should fix the error

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 2a040b2..5540f1b 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -582,6 +582,7 @@ 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





The reverted commit was hiding the issue.

I believe DTB files should be explicitly associated
with CONFIG option in Makefile.
U-Boot used to work that way, and so does Linux.


I do not know how may boards are broken now, but
the right thing to do is to add dtb entries to Makefile,
the revert the bad commit.




-- 
Best Regards
Masahiro Yamada
