Message ID | 20170202113856.728043-1-arnd@arndb.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Dear Arnd,
On Thu, Feb 2, 2017 at 8:38 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> The rename of orion5x-lschl.dts needs to be reflected in the Makefile:
Indeed.
Sorry that I forgot to do it. And thanks for your patch!
Cheers,
Hi Arnd, On jeu., févr. 02 2017, Arnd Bergmann <arnd@arndb.de> wrote: > The rename of orion5x-lschl.dts needs to be reflected in the Makefile: > > make[3]: *** No rule to make target > 'arch/arm/boot/dts/orion5x-lschl.dtb', needed by '__build'. Sorry for that, I did a make dtbs but with the wrong config, (mvebu_v7) :( The offending patch is in my mvebu/fixes branch that you didn't applied yet. How do you want to proceed? Will you applied this patch just after merging tags/mvebu-fixes-4.10-1 ? Do you want I resubmit a PR with your patch? In this case I could also squash your patch in the offending patch. In any case, if needed you can add my Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Thanks, Gregory > > Fixes: 6cfd3cd8d836 ("ARM: dts: orion5x-lschl: More consistent naming on linkstation series") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/boot/dts/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 10eec600cf6b..47208fc5a750 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -633,7 +633,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ > orion5x-lacie-ethernet-disk-mini-v2.dtb \ > orion5x-linkstation-lsgl.dtb \ > orion5x-linkstation-lswtgl.dtb \ > - orion5x-lschl.dtb \ > + orion5x-linkstation-lschl.dtb \ > orion5x-lswsgl.dtb \ > orion5x-maxtor-shared-storage-2.dtb \ > orion5x-netgear-wnr854t.dtb \ > -- > 2.9.0 >
On Thu, Feb 2, 2017 at 2:05 PM, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote: > On jeu., févr. 02 2017, Arnd Bergmann <arnd@arndb.de> wrote: > > Will you applied this patch just after merging tags/mvebu-fixes-4.10-1 ? Ah, I had not realized that. > Do you want I resubmit a PR with your patch? Please add this patch on top of the first and send a new pull request as a reply to the origin pull request. Arnd
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 10eec600cf6b..47208fc5a750 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -633,7 +633,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ orion5x-lacie-ethernet-disk-mini-v2.dtb \ orion5x-linkstation-lsgl.dtb \ orion5x-linkstation-lswtgl.dtb \ - orion5x-lschl.dtb \ + orion5x-linkstation-lschl.dtb \ orion5x-lswsgl.dtb \ orion5x-maxtor-shared-storage-2.dtb \ orion5x-netgear-wnr854t.dtb \
The rename of orion5x-lschl.dts needs to be reflected in the Makefile: make[3]: *** No rule to make target 'arch/arm/boot/dts/orion5x-lschl.dtb', needed by '__build'. Fixes: 6cfd3cd8d836 ("ARM: dts: orion5x-lschl: More consistent naming on linkstation series") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/boot/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)