um: allow disabling NO_IOMEM

Adjust the kconfig a little to allow disabling NO_IOMEM in UML. To
make an "allyesconfig" with CONFIG_NO_IOMEM=n build, adjust a few
Kconfig things elsewhere and add dummy asm/fb.h and asm/vga.h files.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 57cfd9a1c082ee206bb96e64d330194cbf655edc..e72b4b3933672c2007a52cdb080bd404b9996562 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -27,6 +27,10 @@ config MMU
        default y
 
 config NO_IOMEM
+       bool "disable IOMEM" if EXPERT
+       default y
+
+config NO_IOPORT_MAP
        def_bool y
 
 config ISA

diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index d7492e5a1bbba093d09cce79bcb83396a2e0625a..10b7228b3aee9f2a4f2772dd31dd9c0ad095f9b9 100644 (file)
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -7,6 +7,7 @@ generic-y += device.h
 generic-y += emergency-restart.h
 generic-y += exec.h
 generic-y += extable.h
+generic-y += fb.h
 generic-y += ftrace.h
 generic-y += futex.h
 generic-y += hw_irq.h
@@ -27,3 +28,4 @@ generic-y += trace_clock.h
 generic-y += word-at-a-time.h
 generic-y += kprobes.h
 generic-y += mm_hooks.h
+generic-y += vga.h

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index ec0e861f185f367a022bb23ba39b04bddd4813ed..5baebf62df3305ae869c1ab57cfdca96c2f8d7d4 100644 (file)
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -4,7 +4,6 @@
 #
 
 menu "Input device support"
-       depends on !UML
 
 config INPUT
        tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT

diff --git a/drivers/input/gameport/Kconfig b/drivers/input/gameport/Kconfig
index 4761795cb49f56bec3d4dca02eb4c693b567f123..5a2c2fb3217d55ee75f069106fa50789af4a1604 100644 (file)
--- a/drivers/input/gameport/Kconfig
+++ b/drivers/input/gameport/Kconfig
@@ -4,6 +4,7 @@
 #
 config GAMEPORT
        tristate "Gameport support"
+       depends on !UML
        help
          Gameport support is for the standard 15-pin PC gameport. If you
          have a joystick, gamepad, gameport card, a soundcard with a gameport

diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 5e38899058c1d7743d394ba3b7b5d67877eeab04..b10948bf9551b09de201e572e6350fcc3e8f2cde 100644 (file)
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -4,6 +4,7 @@
 #
 menuconfig INPUT_JOYSTICK
        bool "Joysticks/Gamepads"
+       depends on !UML
        help
          If you have a joystick, 6dof controller, gamepad, steering wheel,
          weapon control system or something like that you can say Y here

diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index f6a7fd6d3bb6f54359ee5aba97f142c3151aeec0..5b0736fae70b5a2c2d88a502aa58aab6e8d7c750 100644 (file)
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -12,9 +12,8 @@ if TTY
 
 config VT
        bool "Virtual terminal" if EXPERT
-       depends on !UML
        select INPUT
-       default y
+       default y if !UML
        help
          If you say Y here, you will get support for terminal devices with
          display and keyboard devices. These are called "virtual" because you
@@ -78,7 +77,7 @@ config VT_CONSOLE_SLEEP
 
 config HW_CONSOLE
        bool
-       depends on VT && !UML
+       depends on VT
        default y
 
 config VT_HW_CONSOLE_BINDING

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index ee33b8ec62bb259b2368fa97dc7294c751fbe059..840d9813b0bc693cc9696d515beb701bf2e80393 100644 (file)
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -9,7 +9,7 @@ config VGA_CONSOLE
        bool "VGA text console" if EXPERT || !X86
        depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC &&  !SUPERH && \
                (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
-               !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && !S390
+               !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && !S390 && !UML
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a