| Message ID | 6e8ef238162df5be4462126be155975c722e9863.1519315352.git.alifm@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
This one has been in linux-next for some days. I can carry this via the kvm/s390 tree, but I would like to get ack from at least Bartlomiej. Please also look at patch 3 which also touches drivers/video/console/Kconfig. Adding Greg, as I would like an ack from him for patch 3. On 02/22/2018 05:22 PM, Farhan Ali wrote: > The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' > added the HAS_IOMEM dependecy for "Graphics support". This disabled the > "Graphics support" menu for S390. But if we enable VT layer for S390, > we would also need to enable the dummy console. So let's remove the > HAS_IOMEM dependency. > > Move this dependency to sub menu items and console drivers that use > io memory. > > Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > drivers/video/Kconfig | 5 ++++- > drivers/video/console/Kconfig | 6 +++--- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > index 3c20af9..4f950c6 100644 > --- a/drivers/video/Kconfig > +++ b/drivers/video/Kconfig > @@ -3,7 +3,8 @@ > # > > menu "Graphics support" > - depends on HAS_IOMEM > + > +if HAS_IOMEM > > config HAVE_FB_ATMEL > bool > @@ -36,6 +37,8 @@ config VIDEOMODE_HELPERS > config HDMI > bool > > +endif # HAS_IOMEM > + > if VT > source "drivers/video/console/Kconfig" > endif > diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig > index 7f1f1fb..9485857 100644 > --- a/drivers/video/console/Kconfig > +++ b/drivers/video/console/Kconfig > @@ -9,7 +9,7 @@ config VGA_CONSOLE > depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \ > !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ > (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ > - !ARM64 && !ARC && !MICROBLAZE && !OPENRISC > + !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && HAS_IOMEM > default y > help > Saying Y here will allow you to use Linux in text mode through a > @@ -85,7 +85,7 @@ config MDA_CONSOLE > > config SGI_NEWPORT_CONSOLE > tristate "SGI Newport Console support" > - depends on SGI_IP22 > + depends on SGI_IP22 && HAS_IOMEM > select FONT_SUPPORT > help > Say Y here if you want the console on the Newport aka XL graphics > @@ -153,7 +153,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION > > config STI_CONSOLE > bool "STI text console" > - depends on PARISC > + depends on PARISC && HAS_IOMEM > select FONT_SUPPORT > default y > help > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday, February 27, 2018 10:23:37 AM Christian Borntraeger wrote: > This one has been in linux-next for some days. I can carry this via the kvm/s390 > tree, but I would like to get ack from at least Bartlomiej. Please also look at > patch 3 which also touches drivers/video/console/Kconfig. > > Adding Greg, as I would like an ack from him for patch 3. > > On 02/22/2018 05:22 PM, Farhan Ali wrote: > > The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' > > added the HAS_IOMEM dependecy for "Graphics support". This disabled the > > "Graphics support" menu for S390. But if we enable VT layer for S390, > > we would also need to enable the dummy console. So let's remove the > > HAS_IOMEM dependency. > > > > Move this dependency to sub menu items and console drivers that use > > io memory. > > > > Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> > > Reviewed-by: Thomas Huth <thuth@redhat.com> Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > --- > > drivers/video/Kconfig | 5 ++++- > > drivers/video/console/Kconfig | 6 +++--- > > 2 files changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > > index 3c20af9..4f950c6 100644 > > --- a/drivers/video/Kconfig > > +++ b/drivers/video/Kconfig > > @@ -3,7 +3,8 @@ > > # > > > > menu "Graphics support" > > - depends on HAS_IOMEM > > + > > +if HAS_IOMEM > > > > config HAVE_FB_ATMEL > > bool > > @@ -36,6 +37,8 @@ config VIDEOMODE_HELPERS > > config HDMI > > bool > > > > +endif # HAS_IOMEM > > + > > if VT > > source "drivers/video/console/Kconfig" > > endif > > diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig > > index 7f1f1fb..9485857 100644 > > --- a/drivers/video/console/Kconfig > > +++ b/drivers/video/console/Kconfig > > @@ -9,7 +9,7 @@ config VGA_CONSOLE > > depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \ > > !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ > > (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ > > - !ARM64 && !ARC && !MICROBLAZE && !OPENRISC > > + !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && HAS_IOMEM > > default y > > help > > Saying Y here will allow you to use Linux in text mode through a > > @@ -85,7 +85,7 @@ config MDA_CONSOLE > > > > config SGI_NEWPORT_CONSOLE > > tristate "SGI Newport Console support" > > - depends on SGI_IP22 > > + depends on SGI_IP22 && HAS_IOMEM > > select FONT_SUPPORT > > help > > Say Y here if you want the console on the Newport aka XL graphics > > @@ -153,7 +153,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION > > > > config STI_CONSOLE > > bool "STI text console" > > - depends on PARISC > > + depends on PARISC && HAS_IOMEM > > select FONT_SUPPORT > > default y > > help Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 3c20af9..4f950c6 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -3,7 +3,8 @@ # menu "Graphics support" - depends on HAS_IOMEM + +if HAS_IOMEM config HAVE_FB_ATMEL bool @@ -36,6 +37,8 @@ config VIDEOMODE_HELPERS config HDMI bool +endif # HAS_IOMEM + if VT source "drivers/video/console/Kconfig" endif diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 7f1f1fb..9485857 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -9,7 +9,7 @@ config VGA_CONSOLE depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !FRV && \ !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ - !ARM64 && !ARC && !MICROBLAZE && !OPENRISC + !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && HAS_IOMEM default y help Saying Y here will allow you to use Linux in text mode through a @@ -85,7 +85,7 @@ config MDA_CONSOLE config SGI_NEWPORT_CONSOLE tristate "SGI Newport Console support" - depends on SGI_IP22 + depends on SGI_IP22 && HAS_IOMEM select FONT_SUPPORT help Say Y here if you want the console on the Newport aka XL graphics @@ -153,7 +153,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION config STI_CONSOLE bool "STI text console" - depends on PARISC + depends on PARISC && HAS_IOMEM select FONT_SUPPORT default y help
The 'commit e25df1205f37 ("[S390] Kconfig: menus with depends on HAS_IOMEM.")' added the HAS_IOMEM dependecy for "Graphics support". This disabled the "Graphics support" menu for S390. But if we enable VT layer for S390, we would also need to enable the dummy console. So let's remove the HAS_IOMEM dependency. Move this dependency to sub menu items and console drivers that use io memory. Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> Reviewed-by: Thomas Huth <thuth@redhat.com> --- drivers/video/Kconfig | 5 ++++- drivers/video/console/Kconfig | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-)