From patchwork Mon Feb 29 12:14:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8452651 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3CCD99F52D for ; Mon, 29 Feb 2016 12:17:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A3E32021F for ; Mon, 29 Feb 2016 12:17:08 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 700A0201C0 for ; Mon, 29 Feb 2016 12:17:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aaMin-00027v-EK; Mon, 29 Feb 2016 12:14:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aaMim-00027k-Mi for xen-devel@lists.xen.org; Mon, 29 Feb 2016 12:14:40 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 5C/5E-02979-03634D65; Mon, 29 Feb 2016 12:14:40 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1456748077!26563477!1 X-Originating-IP: [209.85.161.194] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54696 invoked from network); 29 Feb 2016 12:14:38 -0000 Received: from mail-yw0-f194.google.com (HELO mail-yw0-f194.google.com) (209.85.161.194) by server-4.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 29 Feb 2016 12:14:38 -0000 Received: by mail-yw0-f194.google.com with SMTP id h80so7591529ywc.3 for ; Mon, 29 Feb 2016 04:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id; bh=51XgCb6MIe23+AXGGPKbrIfCdLd49PayiEz2aSMKPJ4=; b=Pw50JVu6+Hll3ZQ1YPxhQAlfWjJ8EZ/MSnQo4IvZ7U0N8KAKtRpI+Pgy95smH5c2Tr Ik2PgICm27/lC6TIGeH+EDjJUk1GmyFgR9gs4tJD1Vw+DyThdxRJwpcQvrTrY/jvlZXg OLP031SwqrMHGMnC+UY73FytrHkirK34FOUhw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=51XgCb6MIe23+AXGGPKbrIfCdLd49PayiEz2aSMKPJ4=; b=PATBmijFr2nkNE4/hB7ZgSmItQgIZyt/v24B+VRW87X978S6mmq50kVtO65qfcp6ym Kiokd8OMsh9VIu6ml/LSrnl150PVsexdz59/5i7Bw/VB/F3PobAUI19VwCJr3JiapNX9 YZTqKnQcNIkxPlTeq7CMR8OfAKY+uaA4K9MTpORyQqjOHbyxdjNjvlo1cUTJIUL4fXbX EfiJdYC7wPPFulcD9jOKjpUVWrv62OmQXuQ8bn25XhRThs7P/9f+i1gqLZgN17CP33rm NFZK5MngpXgYrp70+s7BrQlLW91r/dhKdetgmLlL8Z+U2JjChP9IuNr0iyssvs7cDURR Ur+w== X-Gm-Message-State: AD7BkJLHYkXX5rvH5xvlG1jTS1NOi1XYTwilIrHK2cYAZB2QuErwD6Ye6ybDkIqQDHe0nA== X-Received: by 10.129.38.10 with SMTP id m10mr9427651ywm.183.1456748077266; Mon, 29 Feb 2016 04:14:37 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id c84sm20416660ywb.41.2016.02.29.04.14.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Feb 2016 04:14:36 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Mon, 29 Feb 2016 06:14:21 -0600 Message-Id: <1456748062-16842-1-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 Cc: Keir Fraser , Doug Goldstein , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH 1/2] build: consolidate CONFIG_HAS_VGA and CONFIG_VGA X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No real advantage to keeping these separate. The use case of this from Linux is when the platform or target board has support for something but the user wants to be given the option to disable it. Signed-off-by: Doug Goldstein Reviewed-by: Konrad Rzeszutek Wilk --- CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper --- xen/arch/x86/Kconfig | 2 +- xen/drivers/video/Kconfig | 4 ++-- xen/drivers/video/Makefile | 4 ++-- xen/include/asm-x86/config.h | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index ca233b7..73f79cc 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -19,8 +19,8 @@ config X86 select HAS_PASSTHROUGH select HAS_PCI select HAS_PDX - select HAS_VGA select NUMA + select VGA config ARCH_DEFCONFIG string diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 8b25694..03e1e18 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -3,8 +3,8 @@ config HAS_VIDEO bool -# Select HAS_VGA if VGA is supported -config HAS_VGA +# Select VGA if VGA is supported +config VGA bool select HAS_VIDEO diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile index b9b5e23..fab7aba 100644 --- a/xen/drivers/video/Makefile +++ b/xen/drivers/video/Makefile @@ -1,7 +1,7 @@ -obj-$(CONFIG_HAS_VGA) := vga.o +obj-$(CONFIG_VGA) := vga.o obj-$(CONFIG_HAS_VIDEO) += font_8x14.o obj-$(CONFIG_HAS_VIDEO) += font_8x16.o obj-$(CONFIG_HAS_VIDEO) += font_8x8.o obj-$(CONFIG_HAS_VIDEO) += lfb.o -obj-$(CONFIG_HAS_VGA) += vesa.o +obj-$(CONFIG_VGA) += vesa.o obj-$(CONFIG_HAS_ARM_HDLCD) += arm_hdlcd.o diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 08addfb..004a7f6 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -42,7 +42,6 @@ #define CONFIG_ACPI_SRAT 1 #define CONFIG_ACPI_CSTATE 1 -#define CONFIG_VGA 1 #define CONFIG_VIDEO 1 #define CONFIG_WATCHDOG 1