From: Doug Goldstein <cardoe@cardoe.com>
To: xen-devel@lists.xen.org
Cc: Keir Fraser <keir@xen.org>, Doug Goldstein <cardoe@cardoe.com>,
Jan Beulich <jbeulich@suse.com>,
Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH 1/2] build: consolidate CONFIG_HAS_VGA and CONFIG_VGA
Date: Mon, 29 Feb 2016 06:14:21 -0600 [thread overview]
Message-ID: <1456748062-16842-1-git-send-email-cardoe@cardoe.com> (raw)
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 <cardoe@cardoe.com>
---
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
---
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
--
2.4.10
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next reply other threads:[~2016-02-29 12:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 12:14 Doug Goldstein [this message]
2016-02-29 12:14 ` [PATCH 2/2] build: consolidate CONFIG_HAS_VIDEO and CONFIG_VIDEO Doug Goldstein
2016-02-29 20:43 ` [PATCH 1/2] build: consolidate CONFIG_HAS_VGA and CONFIG_VGA Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456748062-16842-1-git-send-email-cardoe@cardoe.com \
--to=cardoe@cardoe.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.