| Message ID | 1456457952-9676-2-git-send-email-cardoe@cardoe.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 26.02.16 at 04:39, <cardoe@cardoe.com> wrote: > --- 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 Even if the needed ARM ack was in place, this wouldn't apply. I suppose there is another patch missing ahead of this one, converting HAS_VGA -> VGA. Jan
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
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: Ian Campbell <ian.campbell@citrix.com> CC: Stefano Stabellini <stefano.stabellini@citrix.com> CC: Keir Fraser <keir@xen.org> CC: Jan Beulich <jbeulich@suse.com> CC: Andrew Cooper <andrew.cooper3@citrix.com> --- 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(-)