--- v2
+++ v3
@@ -4,20 +4,17 @@
we would also need to enable the dummy console. So let's remove the
HAS_IOMEM dependency.
-Move this dependency to Opencores framebuffer driver which would fail to build
-with CONFIG_HAS_IOMEM disabled:
-
-ERROR: "devm_ioremap_resource" [drivers/video/fbdev/ocfb.ko] undefined!
+Move this dependency to sub menu items and console drivers that use
+io memory.
Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com>
-Tested-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
---
- drivers/video/Kconfig | 1 -
- drivers/video/fbdev/Kconfig | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ drivers/video/Kconfig | 21 +++++++++++----------
+ drivers/video/console/Kconfig | 4 ++--
+ 2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 3c20af9..41e7ba9 100644
+index 3c20af9..8f10915 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -3,7 +3,6 @@
@@ -28,19 +25,60 @@
config HAVE_FB_ATMEL
bool
-diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
-index 2f615b7..ec9c9ce 100644
---- a/drivers/video/fbdev/Kconfig
-+++ b/drivers/video/fbdev/Kconfig
-@@ -966,7 +966,7 @@ config FB_PVR2
+@@ -11,20 +10,22 @@ config HAVE_FB_ATMEL
+ config SH_LCD_MIPI_DSI
+ bool
- config FB_OPENCORES
- tristate "OpenCores VGA/LCD core 2.0 framebuffer support"
-- depends on FB && HAS_DMA
-+ depends on FB && HAS_DMA && HAS_IOMEM
- select FB_CFB_FILLRECT
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
+-source "drivers/char/agp/Kconfig"
++if HAS_IOMEM
++ source "drivers/char/agp/Kconfig"
+
+-source "drivers/gpu/vga/Kconfig"
++ source "drivers/gpu/vga/Kconfig"
+
+-source "drivers/gpu/host1x/Kconfig"
+-source "drivers/gpu/ipu-v3/Kconfig"
++ source "drivers/gpu/host1x/Kconfig"
++ source "drivers/gpu/ipu-v3/Kconfig"
+
+-source "drivers/gpu/drm/Kconfig"
++ source "drivers/gpu/drm/Kconfig"
+
+-menu "Frame buffer Devices"
+-source "drivers/video/fbdev/Kconfig"
+-endmenu
++ menu "Frame buffer Devices"
++ source "drivers/video/fbdev/Kconfig"
++ endmenu
+
+-source "drivers/video/backlight/Kconfig"
++ source "drivers/video/backlight/Kconfig"
++endif
+
+ config VGASTATE
+ tristate
+diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
+index 7f1f1fb..0023b16 100644
+--- a/drivers/video/console/Kconfig
++++ b/drivers/video/console/Kconfig
+@@ -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
--
2.7.4