[PATCH] ARM: Include Makefile.boot only when it exists

Shawn Guo shawn.guo at freescale.com
Wed Apr 20 05:41:30 EDT 2011


On Wed, Apr 20, 2011 at 05:27:06PM +0800, Eric Miao wrote:
> On Wed, Apr 20, 2011 at 4:32 PM, Shawn Guo <shawn.guo at freescale.com> wrote:
> > Hi Eric,
> >
> > On Mon, Apr 18, 2011 at 01:19:36PM +0800, Eric Miao wrote:
> >> If AUTO_ZRELADDR is selected and target is not uImage, the existence
> >> of Makefile.boot could be optional.
> >>
> >> Signed-off-by: Eric Miao <eric.y.miao at gmail.com>
> >> ---
> >>  arch/arm/boot/Makefile |    2 +-
> >>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
> >> index 9128fdd..277368f 100644
> >> --- a/arch/arm/boot/Makefile
> >> +++ b/arch/arm/boot/Makefile
> >> @@ -14,7 +14,7 @@
> >>  MKIMAGE         := $(srctree)/scripts/mkuboot.sh
> >>
> >>  ifneq ($(MACHINE),)
> >> -include $(srctree)/$(MACHINE)/Makefile.boot
> >> +-include $(srctree)/$(MACHINE)/Makefile.boot
> >   ^ Makefile grammar?
> 
> Yes. GNU make will only include the file if it _exists_.
> 
Ok, something learnt ...

> >>  endif
> >>
> > I do not understand the patch.  But looking at the patch below, the
> > dtb rule uses Makefile.boot too.
> >
> 
> Since originally there are only definitions like zreladdr defined in
> Makefile.boot,
> and with AUTO_ZRELADDR, some platforms do not need this definition any
> more, which makes Makefile.boot useless on these platforms. Yet it does now
> look like Makefile.boot is so far the best place for these DTB rules.
> 
... so your patch still stands, as DTB is also optional.

-- 
Regards,
Shawn




More information about the linux-arm-kernel mailing list