diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-08-07 00:21:00 +0200 |
|---|---|---|
| committer | Josh Triplett <josh@joshtriplett.org> | 2014-08-09 01:27:14 +0200 |
| commit | 3aaefce10351fecab348f5e06857f44cafc61a62 (patch) | |
| tree | ab63e13c6a3300bc7df97c2a8f486b5d4a922931 /arch/x86/Makefile | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide (diff) | |
| download | linux-3aaefce10351fecab348f5e06857f44cafc61a62.tar.xz linux-3aaefce10351fecab348f5e06857f44cafc61a62.zip | |
x86, platform, kconfig: move kvmconfig functionality to a helper
The new mergeconfig helper makes it easier to add other partial
configurations similar to kvmconfig. Architecture-independent portions
of those partial configurations should go in
kernel/configs/${name}.config, and architecture-dependent portions
should go in arch/${arch}/configs/${name}.config.
Based on a patch by Luis R. Rodriguez <mcgrof@suse.com>.
Originally-Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Modified to make the helper name more general than just virtualization,
support architecture-dependent and architecture-independent partial
configurations, move the helper and kvmconfig to
scripts/kconfig/Makefile, and factor out more of the common file path.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index c65fd9650467..fcc74b7aabb0 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -247,12 +247,6 @@ archclean: $(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=arch/x86/tools -PHONY += kvmconfig -kvmconfig: - $(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target)) - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/kvm_guest.config - $(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig - define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' echo ' install - Install kernel using' @@ -266,5 +260,4 @@ define archhelp echo ' bzdisk/fdimage*/isoimage also accept:' echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' - echo ' kvmconfig - Enable additional options for guest kernel support' endef |