Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: [PATCH] fix rebuild of wakeup.bin | Date | Thu, 1 May 2008 12:48:52 +0200 |
| |
On Thursday, 1 of May 2008, Sam Ravnborg wrote: > In kernel/acpi/realmode/Makefile use the 'always' > variable to say that wakeup.bin should always > be made. > > In acpi/Makefile we then do not need to specify the > requested target and we avoid the message from make: > > `arch/x86/kernel/acpi/realmode/wakeup.bin' is up to date. > > Add wakeup.lds to list af targets to avoid rebuilding > wakeup.bin - from Roland McGrath.
Thanks for fixing this!
Ingo, please merge.
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Rafael J. Wysocki <rjw@sisk.pl> > Cc: Pavel Machek <pavel@suse.cz> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: H. Peter Anvin <hpa@zytor.com> > Cc: Ingo Molnar <mingo@elte.hu> > Cc: Roland McGrath <roland@redhat.com> > --- > diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile > index 7335959..fd5ca97 100644 > --- a/arch/x86/kernel/acpi/Makefile > +++ b/arch/x86/kernel/acpi/Makefile > @@ -10,5 +10,5 @@ endif > $(obj)/wakeup_rm.o: $(obj)/realmode/wakeup.bin > > $(obj)/realmode/wakeup.bin: FORCE > - $(Q)$(MAKE) $(build)=$(obj)/realmode $@ > + $(Q)$(MAKE) $(build)=$(obj)/realmode > > diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile > index 0929008..1c31cc0 100644 > --- a/arch/x86/kernel/acpi/realmode/Makefile > +++ b/arch/x86/kernel/acpi/realmode/Makefile > @@ -6,7 +6,8 @@ > # for more details. > # > > -targets := wakeup.bin wakeup.elf > +always := wakeup.bin > +targets := wakeup.elf wakeup.lds > > wakeup-y += wakeup.o wakemain.o video-mode.o copy.o > > @@ -48,7 +49,7 @@ LDFLAGS_wakeup.elf := -T > > CPPFLAGS_wakeup.lds += -P -C > > -$(obj)/wakeup.elf: $(src)/wakeup.lds $(WAKEUP_OBJS) FORCE > +$(obj)/wakeup.elf: $(obj)/wakeup.lds $(WAKEUP_OBJS) FORCE > $(call if_changed,ld) > > OBJCOPYFLAGS_wakeup.bin := -O binary
Thanks, Rafael
| |