---

yaml --- r: 220524 b: refs/heads/master c: b17ed48 h: refs/heads/master v: v3
git-mirror · Oct 27, 2010 · 2a8d8e1 · 2a8d8e1
1 parent 6858964
commit 2a8d8e1
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 937f961a6539b0ac5ebf31472b90810bc1f02200
+refs/heads/master: b17ed48040d9e8b6ae35bc492015bf0fe1c8bae4
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
@@ -81,7 +81,6 @@ obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_MODULES)		+= module.o
-obj-$(CONFIG_EFI) 		+= efi.o efi_$(BITS).o efi_stub_$(BITS).o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault_32.o
 obj-$(CONFIG_KGDB)		+= kgdb.o
 obj-$(CONFIG_VM86)		+= vm86_32.o

diff --git a/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile
@@ -1,2 +1,3 @@
 # Platform specific code goes here
+obj-y	+= efi/
 obj-y	+= sfi/
diff --git a/trunk/arch/x86/platform/efi/Makefile b/trunk/arch/x86/platform/efi/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_EFI) 		+= efi.o efi_$(BITS).o efi_stub_$(BITS).o
diff --git a/trunk/arch/x86/kernel/efi.c → trunk/arch/x86/platform/efi/efi.c b/trunk/arch/x86/kernel/efi.c → trunk/arch/x86/platform/efi/efi.c
diff --git a/trunk/arch/x86/kernel/efi_32.c → trunk/arch/x86/platform/efi/efi_32.c b/trunk/arch/x86/kernel/efi_32.c → trunk/arch/x86/platform/efi/efi_32.c
diff --git a/trunk/arch/x86/kernel/efi_64.c → trunk/arch/x86/platform/efi/efi_64.c b/trunk/arch/x86/kernel/efi_64.c → trunk/arch/x86/platform/efi/efi_64.c
diff --git a/trunk/arch/x86/kernel/efi_stub_32.S → trunk/arch/x86/platform/efi/efi_stub_32.S b/trunk/arch/x86/kernel/efi_stub_32.S → trunk/arch/x86/platform/efi/efi_stub_32.S
diff --git a/trunk/arch/x86/kernel/efi_stub_64.S → trunk/arch/x86/platform/efi/efi_stub_64.S b/trunk/arch/x86/kernel/efi_stub_64.S → trunk/arch/x86/platform/efi/efi_stub_64.S
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o