From b17ed48040d9e8b6ae35bc492015bf0fe1c8bae4 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 16 Oct 2010 10:19:54 +0200 Subject: [PATCH] x86: Move efi to platform Signed-off-by: Thomas Gleixner Cc: Huang Ying --- arch/x86/kernel/Makefile | 1 - arch/x86/platform/Makefile | 1 + arch/x86/platform/efi/Makefile | 1 + arch/x86/{kernel => platform/efi}/efi.c | 0 arch/x86/{kernel => platform/efi}/efi_32.c | 0 arch/x86/{kernel => platform/efi}/efi_64.c | 0 arch/x86/{kernel => platform/efi}/efi_stub_32.S | 0 arch/x86/{kernel => platform/efi}/efi_stub_64.S | 0 8 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 arch/x86/platform/efi/Makefile rename arch/x86/{kernel => platform/efi}/efi.c (100%) rename arch/x86/{kernel => platform/efi}/efi_32.c (100%) rename arch/x86/{kernel => platform/efi}/efi_64.c (100%) rename arch/x86/{kernel => platform/efi}/efi_stub_32.S (100%) rename arch/x86/{kernel => platform/efi}/efi_stub_64.S (100%) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index d9067d10c6af..b01c7b1ac1ba 100644 --- 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 a964fa3c0868..99e95b32ae7d 100644 --- 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 index 000000000000..73b8be0f3675 --- /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