Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c6214c7 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ingo Molnar
Browse files

kbuild, suspend, x86: fix rebuild of wakeup.bin 



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.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@suse.cz>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 22eecde2

arch/x86/kernel/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/acpi/realmode/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -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