Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752685AbaFFXLb (ORCPT ); Fri, 6 Jun 2014 19:11:31 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:44111 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752418AbaFFXL2 (ORCPT ); Fri, 6 Jun 2014 19:11:28 -0400 From: "Luis R. Rodriguez" To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" , Borislav Petkov , Pekka Enberg , David Rientjes , Michal Marek , Randy Dunlap , levinsasha928@gmail.com, mtosatti@redhat.com, fengguang.wu@intel.com, David Vrabel , Ian Campbell , Konrad Rzeszutek Wilk , xen-devel@lists.xenproject.org Subject: [PATCH 3/3] x86, platform, kconfig: add virtconfig defconfig helper Date: Fri, 6 Jun 2014 16:11:09 -0700 Message-Id: <1402096269-4512-3-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1402096269-4512-1-git-send-email-mcgrof@do-not-panic.com> References: <1402096269-4512-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Luis R. Rodriguez" This lets you use: make virtconfig to merge you current kernel configuration with options to enable both kvm and xen (dom0 and guest) requirements. Cc: Borislav Petkov Cc: Pekka Enberg Cc: David Rientjes Cc: Michal Marek Cc: Randy Dunlap Cc: penberg@kernel.org Cc: levinsasha928@gmail.com Cc: mtosatti@redhat.com Cc: fengguang.wu@intel.com Cc: David Vrabel Cc: Ian Campbell Cc: Konrad Rzeszutek Wilk Cc: xen-devel@lists.xenproject.org Signed-off-by: Luis R. Rodriguez --- arch/x86/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 9db34e2..f2df13e 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -262,6 +262,11 @@ xenconfig: $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/xen.config $(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig +PHONY += virtconfig +virtconfig: + $(Q)$(MAKE) kvmconfig + $(Q)$(MAKE) xenconfig + define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)' echo ' install - Install kernel using' @@ -277,4 +282,5 @@ define archhelp echo ' FDINITRD=file initrd for the booted kernel' echo ' kvmconfig - Enable additional options for kvm guest kernel support' echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' + echo ' virtconfig - Enable additional options for kvm and xen kernel support' endef -- 2.0.0.rc3.18.g00a5b79 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/