[RFC,1/1] powerpc/fsl: Fix build of the dtb embedded kernel images

The commit dc37374 move a lot of device tree files into fsl directory
fixing Makefile for cuImage target only. Unfortunately there are others
target which require to embebbed device tree into the kernel image
(i.e. dtbImage.%). So use a more generic approach.

Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
---
 arch/powerpc/boot/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Hi,

On 6 April 2016 at 15:45, Alessio Igor Bogani <alessio.bogani@elettra.eu> wrote:
> The commit dc37374 move a lot of device tree files into fsl directory
> fixing Makefile for cuImage target only. Unfortunately there are others
> target which require to embebbed device tree into the kernel image
> (i.e. dtbImage.%). So use a more generic approach.
>
> Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
> ---
>  arch/powerpc/boot/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
> index 6116510..8fe78a3 100644
> --- a/arch/powerpc/boot/Makefile
> +++ b/arch/powerpc/boot/Makefile
> @@ -362,9 +362,6 @@ $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
>  $(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
>         $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
>
> -$(obj)/cuImage.%: vmlinux $(obj)/fsl/%.dtb $(wrapperbits)
> -       $(call if_changed,wrap,cuboot-$*,,$(obj)/fsl/$*.dtb)
> -
>  $(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
>         $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
>
> @@ -381,6 +378,9 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
>  $(obj)/%.dtb: $(src)/dts/%.dts FORCE
>         $(call if_changed_dep,dtc)
>
> +$(obj)/%.dtb: $(src)/dts/fsl/%.dts FORCE
> +       $(call if_changed_dep,dtc)
> +
>  # If there isn't a platform selected then just strip the vmlinux.
>  ifeq (,$(image-y))
>  image-y := vmlinux.strip

Any comments?

Ciao,
Alessio

On Fri, 2016-04-15 at 10:27 +0200, Alessio Igor Bogani wrote:
> Hi,
> 
> On 6 April 2016 at 15:45, Alessio Igor Bogani <alessio.bogani@elettra.eu>
> wrote:
> > The commit dc37374 move a lot of device tree files into fsl directory
> > fixing Makefile for cuImage target only. Unfortunately there are others
> > target which require to embebbed device tree into the kernel image
> > (i.e. dtbImage.%). So use a more generic approach.
> > 
> > Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
> > ---
> >  arch/powerpc/boot/Makefile | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
> > index 6116510..8fe78a3 100644
> > --- a/arch/powerpc/boot/Makefile
> > +++ b/arch/powerpc/boot/Makefile
> > @@ -362,9 +362,6 @@ $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb
> > $(wrapperbits)
> >  $(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
> >         $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
> > 
> > -$(obj)/cuImage.%: vmlinux $(obj)/fsl/%.dtb $(wrapperbits)
> > -       $(call if_changed,wrap,cuboot-$*,,$(obj)/fsl/$*.dtb)
> > -
> >  $(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
> >         $(call if_changed,wrap,simpleboot
> > -$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
> > 
> > @@ -381,6 +378,9 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb
> > $(wrapperbits)
> >  $(obj)/%.dtb: $(src)/dts/%.dts FORCE
> >         $(call if_changed_dep,dtc)
> > 
> > +$(obj)/%.dtb: $(src)/dts/fsl/%.dts FORCE
> > +       $(call if_changed_dep,dtc)
> > +
> >  # If there isn't a platform selected then just strip the vmlinux.
> >  ifeq (,$(image-y))
> >  image-y := vmlinux.strip
> 
> Any comments?

Looks OK to me.

-Scott

Scott,

On 17 April 2016 at 03:50, Scott Wood <oss@buserror.net> wrote:
> On Fri, 2016-04-15 at 10:27 +0200, Alessio Igor Bogani wrote:
[...]
>> Any comments?
>
> Looks OK to me.

Thanks for review it. Follow a no-RFC version.

Ciao,
Alessio