diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 15:07:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 15:07:54 -0500 |
| commit | 2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45 (patch) | |
| tree | 3671fd287ecbe739cb79537fb5353bcecb939aa9 /arch/x86/kernel/cpu/microcode/Makefile | |
| parent | 4500cf60dbe4b7f514d11b24c3e1edfda2a6d69d (diff) | |
| parent | 9c079129d7bfb24251890e40694fd79dd1872ed9 (diff) | |
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 microcode loader updates from Ingo Molnar:
"There are two main changes in this tree:
- AMD microcode early loading fixes
- some microcode loader source files reorganization"
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode: Move to a proper location
x86, microcode, AMD: Fix early ucode loading
x86, microcode: Share native MSR accessing variants
x86, ramdisk: Export relocated ramdisk VA
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/Makefile')
| -rw-r--r-- | arch/x86/kernel/cpu/microcode/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/microcode/Makefile b/arch/x86/kernel/cpu/microcode/Makefile new file mode 100644 index 000000000000..285c85427c32 --- /dev/null +++ b/arch/x86/kernel/cpu/microcode/Makefile | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | microcode-y := core.o | ||
| 2 | obj-$(CONFIG_MICROCODE) += microcode.o | ||
| 3 | microcode-$(CONFIG_MICROCODE_INTEL) += intel.o intel_lib.o | ||
| 4 | microcode-$(CONFIG_MICROCODE_AMD) += amd.o | ||
| 5 | obj-$(CONFIG_MICROCODE_EARLY) += core_early.o | ||
| 6 | obj-$(CONFIG_MICROCODE_INTEL_EARLY) += intel_early.o | ||
| 7 | obj-$(CONFIG_MICROCODE_AMD_EARLY) += amd_early.o | ||