From patchwork Fri Feb 26 03:39:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8431071 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 F3C939F7C9 for ; Fri, 26 Feb 2016 03:43:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D3B720279 for ; Fri, 26 Feb 2016 03:43:11 +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 6C3D42038F for ; Fri, 26 Feb 2016 03:43:10 +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 1aZ9Gi-0008UP-1v; Fri, 26 Feb 2016 03:40:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aZ9Gg-0008Tx-FZ for xen-devel@lists.xen.org; Fri, 26 Feb 2016 03:40:38 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id B8/CB-03800-539CFC65; Fri, 26 Feb 2016 03:40:37 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1456458035!16719274!1 X-Originating-IP: [209.85.161.196] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43644 invoked from network); 26 Feb 2016 03:40:36 -0000 Received: from mail-yw0-f196.google.com (HELO mail-yw0-f196.google.com) (209.85.161.196) by server-15.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 26 Feb 2016 03:40:36 -0000 Received: by mail-yw0-f196.google.com with SMTP id c124so3522382ywe.0 for ; Thu, 25 Feb 2016 19:40:36 -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:in-reply-to:references; bh=GO0Xe3ZQAZVhuobeGxYBQNFCO+QYulHSc8vTFtncdNk=; b=ZMjs/tUAoZBpMlocOJpXpMGgTkfIVwTvt+ySc8o0fXDKlv6MvXufKp4uts0Z4fNM12 nxlz85/tzKDuc+mg+K0xEA3+VAHFZVQtUFeZcP4m7AfGupRwrkqD7IZW0EnOwY+2b9Zr UxvUKqNeOFaE2/2AfGIN41mWuQ1jIAamcMywE= 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:in-reply-to :references; bh=GO0Xe3ZQAZVhuobeGxYBQNFCO+QYulHSc8vTFtncdNk=; b=eOsd/QrMlXQqUDabMCo+8tOWJA//9EKGmsG1xpnxaB9lmeYpwGkFzuFjH3zu/aNLWh lFaUEXfoXgwW9Aa6He24mP7dEJylNsd/WLpZdATwEMkYWjH7jNVefnIKg2svjk4UhBtv mSRowQ83ZpcNd4roTACpZTWzqXNhnAJLkpPEXcH3B+eaBP/39Rx+x7lBquK3+wr63zmj OuaB3PmcLh/KKyFno1y4/JqwDtgtptoJCNi0dqtebu4gXv8HNfIw2YI7nY+qtCGtqC8C ylEMAY0p5Z6INsj6JWvpjMPMcmtI59QwzYeL2wrJXyaJTyxAjvdrLO61k1/bAh+5XiuD dqDw== X-Gm-Message-State: AG10YOSxgu+1e8Rqssm0yn+DUxvocelksQ500xRUDrkz4hChwnOKCVYFZH1L7+F7npROzg== X-Received: by 10.129.87.2 with SMTP id l2mr27704763ywb.126.1456458035708; Thu, 25 Feb 2016 19:40:35 -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 d8sm7492805ywc.26.2016.02.25.19.40.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Feb 2016 19:40:34 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Thu, 25 Feb 2016 21:39:09 -0600 Message-Id: <1456457952-9676-2-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1456457952-9676-1-git-send-email-cardoe@cardoe.com> References: <1456457952-9676-1-git-send-email-cardoe@cardoe.com> Cc: Keir Fraser , Ian Campbell , Andrew Cooper , Doug Goldstein , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH 1/4] build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO 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, 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 --- CC: Ian Campbell CC: Stefano Stabellini CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper --- xen/arch/arm/Kconfig | 2 +- xen/drivers/Makefile | 2 +- xen/drivers/video/Kconfig | 6 +++--- xen/drivers/video/Makefile | 8 ++++---- xen/include/asm-arm/config.h | 2 -- xen/include/asm-x86/config.h | 2 -- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 60e923c..cb99df5 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -22,7 +22,7 @@ config ARM select HAS_MEM_ACCESS select HAS_PASSTHROUGH select HAS_PDX - select HAS_VIDEO + select VIDEO config ARCH_DEFCONFIG string diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index 7bbb654..ec2b8f2 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -3,4 +3,4 @@ subdir-$(CONFIG_HAS_CPUFREQ) += cpufreq subdir-$(CONFIG_HAS_PCI) += pci subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough subdir-$(CONFIG_HAS_ACPI) += acpi -subdir-$(CONFIG_HAS_VIDEO) += video +subdir-$(CONFIG_VIDEO) += video diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 03e1e18..739fe6f 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -1,12 +1,12 @@ -# Select HAS_VIDEO if video is supported -config HAS_VIDEO +# Select VIDEO if video is supported +config VIDEO bool # Select VGA if VGA is supported config VGA bool - select HAS_VIDEO + select VIDEO # Select HAS_ARM_HDLCD if ARM HDLCD is supported config HAS_ARM_HDLCD diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile index fab7aba..2bb91d6 100644 --- a/xen/drivers/video/Makefile +++ b/xen/drivers/video/Makefile @@ -1,7 +1,7 @@ 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_VIDEO) += font_8x14.o +obj-$(CONFIG_VIDEO) += font_8x16.o +obj-$(CONFIG_VIDEO) += font_8x8.o +obj-$(CONFIG_VIDEO) += lfb.o obj-$(CONFIG_VGA) += vesa.o obj-$(CONFIG_HAS_ARM_HDLCD) += arm_hdlcd.o diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index c3a2c30..43ecfb4 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -32,8 +32,6 @@ #define CONFIG_SMP 1 -#define CONFIG_VIDEO 1 - #define CONFIG_IRQ_HAS_MULTIPLE_ACTION 1 #define CONFIG_PAGEALLOC_MAX_ORDER 18 diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3274337..ca303b6 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -43,8 +43,6 @@ #define CONFIG_ACPI_SRAT 1 #define CONFIG_ACPI_CSTATE 1 -#define CONFIG_VIDEO 1 - #define CONFIG_WATCHDOG 1 #define CONFIG_MULTIBOOT 1