x86: Move efi to platform

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Huang Ying <ying.huang@intel.com>

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index d9067d1..b01c7b1 100644 (file)
--- a/arch/x86/kernel/Makefile
+++ b/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/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index a964fa3..99e95b3 100644 (file)
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -1,2 +1,3 @@
 # Platform specific code goes here
+obj-y  += efi/
 obj-y  += sfi/

diff --git a/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile
new file mode 100644 (file)
index 0000000..73b8be0
--- /dev/null
+++ b/arch/x86/platform/efi/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_EFI)              += efi.o efi_$(BITS).o efi_stub_$(BITS).o

diff --git a/arch/x86/kernel/efi.c b/arch/x86/platform/efi/efi.c
similarity index 100%
rename from arch/x86/kernel/efi.c
rename to arch/x86/platform/efi/efi.c

diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/platform/efi/efi_32.c
similarity index 100%
rename from arch/x86/kernel/efi_32.c
rename to arch/x86/platform/efi/efi_32.c

diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/platform/efi/efi_64.c
similarity index 100%
rename from arch/x86/kernel/efi_64.c
rename to arch/x86/platform/efi/efi_64.c

diff --git a/arch/x86/kernel/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
similarity index 100%
rename from arch/x86/kernel/efi_stub_32.S
rename to arch/x86/platform/efi/efi_stub_32.S

diff --git a/arch/x86/kernel/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
similarity index 100%
rename from arch/x86/kernel/efi_stub_64.S
rename to arch/x86/platform/efi/efi_stub_64.S