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

Commit c4845474 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by H. Peter Anvin
Browse files

x86, realmode: flattened rm hierachy 



Simplified hierarchy under rm directory to a flat
directory because it is not anymore really justified
to have own directory for wakeup code. It only adds
more complexity.

Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@intel.com>
Link: http://lkml.kernel.org/r/1336501366-28617-20-git-send-email-jarkko.sakkinen@intel.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent b429dbf6

arch/x86/kernel/acpi/sleep.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <asm/cacheflush.h>

#include <asm/realmode.h>



#include "../../realmode/rm/wakeup/wakeup.h"

#include "../../realmode/rm/wakeup.h"

#include "sleep.h"



unsigned long acpi_realmode_flags;

arch/x86/realmode/rm/Makefile

+13 −7
Original line number Diff line number Diff line
@@ -7,21 +7,26 @@ 
#

#



subdir- := wakeup



always := realmode.bin



realmode-y			+= header.o

realmode-y			+= trampoline_$(BITS).o

realmode-y			+= stack.o

realmode-$(CONFIG_X86_32)	+= reboot_32.o

realmode-$(CONFIG_ACPI_SLEEP)	+= wakeup/wakeup.o

realmode-$(CONFIG_ACPI_SLEEP)	+= $(wakeup-objs)



wakeup-objs	:= wakeup_asm.o wakemain.o video-mode.o

wakeup-objs	+= copy.o bioscall.o regs.o

# The link order of the video-*.o modules can matter.  In particular,

# video-vga.o *must* be listed first, followed by video-vesa.o.

# Hardware-specific drivers should follow in the order they should be

# probed, and video-bios.o should typically be last.

wakeup-objs	+= video-vga.o

wakeup-objs	+= video-vesa.o

wakeup-objs	+= video-bios.o



targets	+= $(realmode-y)



$(obj)/wakeup/wakeup.o: FORCE

	$(Q)$(MAKE) $(build)=$(obj)/wakeup $@



REALMODE_OBJS = $(addprefix $(obj)/,$(realmode-y))



sed-pasyms := -n -r -e 's/^([0-9a-fA-F]+) [ABCDGRSTVW] (.+)$$/pa_\2 = \2;/p'
@@ -55,7 +60,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE 


# How to compile the 16-bit code.  Note we always compile for -march=i386,

# that way we can complain to the user if the CPU is insufficient.

KBUILD_CFLAGS	:= $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ \

KBUILD_CFLAGS	:= $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \

		   -I$(srctree)/arch/x86/boot \

		   -DDISABLE_BRANCH_PROFILING \

		   -Wall -Wstrict-prototypes \

		   -march=i386 -mregparm=3 \

arch/x86/realmode/rm/bioscall.S

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../../boot/bioscall.S"

arch/x86/realmode/rm/copy.S

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../../boot/copy.S"

arch/x86/realmode/rm/regs.c

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../../boot/regs.c"