On Tue, Apr 02, 2019 at 03:16:10PM -0500, Troy Benjegerdes wrote: > > > On Mar 31, 2019, at 5:02 PM, Tom Rini <[email protected]> wrote: > > > > On Fri, Mar 29, 2019 at 11:15:48PM -0700, Troy Benjegerdes wrote: > > > >> I attempted to merge in the latest master branch into > >> https://github.com/sifive/u-boot/tree/sandbox and I got > >> the following error, which seems somewhat broken.. > >> > >> > >> Device Tree Source is not correctly specified. > >> Please define 'CONFIG_DEFAULT_DEVICE_TREE' > >> or build with 'DEVICE_TREE=<device_tree>' argument > >> > >> dts/Makefile:28: recipe for target 'arch/riscv/dts/fu540.dtb' failed > >> > >> > >> Does anyone have any idea what would have caused that? > >> > >> Also any feedback or pointers on why the serial_sifive.c > >> driver with CONFIG_DM_SERIAL would not work, but serial_hifive.c > >> without CONFIG_DM_SERIAL does seem to work might be appreciated. > > > > You'll need to do something like > > > > commit 89c2b5c02049aea746b1edee0b4e1d8519dec2f4 > > Author: Masahiro Yamada <[email protected]> > > Date: Thu Mar 14 14:58:33 2019 +0900 > > > > ARM: fix arch/arm/dts/Makefile > > > > 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 <[email protected]> > > Reviewed-by: Chris Packham <[email protected]> > > [trini: add imx6ul pico dtbs] > > Signed-off-by: Tom Rini <[email protected]> > > > > But to arch/riscv/dts/Makefile > > I ended up reverting that commit, and we now have > https://github.com/sifive/u-boot/tree/sandbox booting to a prompt > based on upstream master.
Note that you just need something like:
obj-y += first.dtb \
second.dtb
--
Tom
signature.asc
Description: PGP signature
_______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
