On Sat, 23 Jan 2016 23:17:24 +0300 Antony Pavlov <antonynpavlov@xxxxxxxxx> wrote: > Do as arch/mips/boot/dts/ralink/Makefile does. > Without this patch adding a dtb-file leads > to adding __two__ lines to the Makefile. I have some patches in my queue to allow using appended DTB and remove the builtin DTB support. That would also fix the problem as the second Makefile line wouldn't be needed anymore. I try to post them soon. Alban > Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx> > Cc: Alban Bedel <albeu@xxxxxxx> > Cc: linux-mips@xxxxxxxxxxxxxx > --- > arch/mips/boot/dts/qca/Makefile | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile > index 2d61455d..244329e 100644 > --- a/arch/mips/boot/dts/qca/Makefile > +++ b/arch/mips/boot/dts/qca/Makefile > @@ -1,8 +1,7 @@ > # All DTBs > -dtb-$(CONFIG_ATH79) += ar9132_tl_wr1043nd_v1.dtb > +dtb-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb > > -# Select a DTB to build in the kernel > -obj-$(CONFIG_DTB_TL_WR1043ND_V1) += ar9132_tl_wr1043nd_v1.dtb.o > +obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) > > # Force kbuild to make empty built-in.o if necessary > obj- += dummy.o
