diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-16 04:19:54 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-27 08:30:01 -0400 |
| commit | b17ed48040d9e8b6ae35bc492015bf0fe1c8bae4 (patch) | |
| tree | 64c31f66a0fc65268d02b2cee14e7abd760121e9 /arch/x86 | |
| parent | 937f961a6539b0ac5ebf31472b90810bc1f02200 (diff) | |
x86: Move efi to platform
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Huang Ying <ying.huang@intel.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/efi/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/platform/efi/efi.c (renamed from arch/x86/kernel/efi.c) | 0 | ||||
| -rw-r--r-- | arch/x86/platform/efi/efi_32.c (renamed from arch/x86/kernel/efi_32.c) | 0 | ||||
| -rw-r--r-- | arch/x86/platform/efi/efi_64.c (renamed from arch/x86/kernel/efi_64.c) | 0 | ||||
| -rw-r--r-- | arch/x86/platform/efi/efi_stub_32.S (renamed from arch/x86/kernel/efi_stub_32.S) | 0 | ||||
| -rw-r--r-- | arch/x86/platform/efi/efi_stub_64.S (renamed from arch/x86/kernel/efi_stub_64.S) | 0 |
8 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index d9067d10c6a..b01c7b1ac1b 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -81,7 +81,6 @@ obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o | |||
| 81 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o | 81 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o |
| 82 | obj-$(CONFIG_KPROBES) += kprobes.o | 82 | obj-$(CONFIG_KPROBES) += kprobes.o |
| 83 | obj-$(CONFIG_MODULES) += module.o | 83 | obj-$(CONFIG_MODULES) += module.o |
| 84 | obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o | ||
| 85 | obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o | 84 | obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o |
| 86 | obj-$(CONFIG_KGDB) += kgdb.o | 85 | obj-$(CONFIG_KGDB) += kgdb.o |
| 87 | obj-$(CONFIG_VM86) += vm86_32.o | 86 | obj-$(CONFIG_VM86) += vm86_32.o |
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index a964fa3c086..99e95b32ae7 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | # Platform specific code goes here | 1 | # Platform specific code goes here |
| 2 | obj-y += efi/ | ||
| 2 | obj-y += sfi/ | 3 | obj-y += sfi/ |
diff --git a/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile new file mode 100644 index 00000000000..73b8be0f367 --- /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 index 0fe27d7c625..0fe27d7c625 100644 --- a/arch/x86/kernel/efi.c +++ b/arch/x86/platform/efi/efi.c | |||
diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/platform/efi/efi_32.c index 5cab48ee61a..5cab48ee61a 100644 --- a/arch/x86/kernel/efi_32.c +++ b/arch/x86/platform/efi/efi_32.c | |||
diff --git a/arch/x86/kernel/efi_64.c b/arch/x86/platform/efi/efi_64.c index ac0621a7ac3..ac0621a7ac3 100644 --- a/arch/x86/kernel/efi_64.c +++ b/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 index fbe66e626c0..fbe66e626c0 100644 --- a/arch/x86/kernel/efi_stub_32.S +++ b/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 index 4c07ccab814..4c07ccab814 100644 --- a/arch/x86/kernel/efi_stub_64.S +++ b/arch/x86/platform/efi/efi_stub_64.S | |||