x86, microcode: Move to a proper location
We've grown a bunch of microcode loader files all prefixed with "microcode_". They should be under cpu/ because this is strictly CPU-related functionality so do that and drop the prefix since they're in their own directory now which gives that prefix. :) While at it, drop MICROCODE_INTEL_LIB config item and stash the functionality under CONFIG_MICROCODE_INTEL as it was its only user. Signed-off-by: Borislav Petkov <bp@suse.de> Tested-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
This commit is contained in:
parent
5335ba5cf4
commit
bad5fa631f
11 changed files with 8 additions and 13 deletions
|
@ -1080,10 +1080,6 @@ config MICROCODE_OLD_INTERFACE
|
||||||
def_bool y
|
def_bool y
|
||||||
depends on MICROCODE
|
depends on MICROCODE
|
||||||
|
|
||||||
config MICROCODE_INTEL_LIB
|
|
||||||
def_bool y
|
|
||||||
depends on MICROCODE_INTEL
|
|
||||||
|
|
||||||
config MICROCODE_INTEL_EARLY
|
config MICROCODE_INTEL_EARLY
|
||||||
def_bool n
|
def_bool n
|
||||||
|
|
||||||
|
|
|
@ -91,15 +91,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o
|
||||||
|
|
||||||
obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
|
obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
|
||||||
|
|
||||||
obj-$(CONFIG_MICROCODE_EARLY) += microcode_core_early.o
|
|
||||||
obj-$(CONFIG_MICROCODE_INTEL_EARLY) += microcode_intel_early.o
|
|
||||||
obj-$(CONFIG_MICROCODE_INTEL_LIB) += microcode_intel_lib.o
|
|
||||||
microcode-y := microcode_core.o
|
|
||||||
microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o
|
|
||||||
microcode-$(CONFIG_MICROCODE_AMD) += microcode_amd.o
|
|
||||||
obj-$(CONFIG_MICROCODE_AMD_EARLY) += microcode_amd_early.o
|
|
||||||
obj-$(CONFIG_MICROCODE) += microcode.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o
|
obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o
|
||||||
|
|
||||||
obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
|
obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
|
||||||
|
|
|
@ -42,6 +42,7 @@ endif
|
||||||
|
|
||||||
obj-$(CONFIG_X86_MCE) += mcheck/
|
obj-$(CONFIG_X86_MCE) += mcheck/
|
||||||
obj-$(CONFIG_MTRR) += mtrr/
|
obj-$(CONFIG_MTRR) += mtrr/
|
||||||
|
obj-$(CONFIG_MICROCODE) += microcode/
|
||||||
|
|
||||||
obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o perf_event_amd_ibs.o
|
obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o perf_event_amd_ibs.o
|
||||||
|
|
||||||
|
|
7
arch/x86/kernel/cpu/microcode/Makefile
Normal file
7
arch/x86/kernel/cpu/microcode/Makefile
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
microcode-y := core.o
|
||||||
|
obj-$(CONFIG_MICROCODE) += microcode.o
|
||||||
|
microcode-$(CONFIG_MICROCODE_INTEL) += intel.o intel_lib.o
|
||||||
|
microcode-$(CONFIG_MICROCODE_AMD) += amd.o
|
||||||
|
obj-$(CONFIG_MICROCODE_EARLY) += core_early.o
|
||||||
|
obj-$(CONFIG_MICROCODE_INTEL_EARLY) += intel_early.o
|
||||||
|
obj-$(CONFIG_MICROCODE_AMD_EARLY) += amd_early.o
|
Loading…
Reference in a new issue