iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

um: allow disabling NO_IOMEM

Browse Source 
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>
This commit is contained in:
Johannes Berg 2021-03-05 13:19:51 +01:00 committed by Richard Weinberger
parent 009c9aa5be
commit 0bbadafdc4
7 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/um/Kconfig
View File

@ -27,6 +27,10 @@ config MMU
default y default y
config NO_IOMEM config NO_IOMEM
bool "disable IOMEM" if EXPERT
default y
config NO_IOPORT_MAP
def_bool y def_bool y
config ISA config ISA

2
arch/um/include/asm/Kbuild
View File

@ -7,6 +7,7 @@ generic-y += device.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += exec.h generic-y += exec.h
generic-y += extable.h generic-y += extable.h
generic-y += fb.h
generic-y += ftrace.h generic-y += ftrace.h
generic-y += futex.h generic-y += futex.h
generic-y += hw_irq.h generic-y += hw_irq.h
@ -27,3 +28,4 @@ generic-y += trace_clock.h
generic-y += word-at-a-time.h generic-y += word-at-a-time.h
generic-y += kprobes.h generic-y += kprobes.h
generic-y += mm_hooks.h generic-y += mm_hooks.h
generic-y += vga.h

1
drivers/input/Kconfig
View File

@ -4,7 +4,6 @@
# #
menu "Input device support" menu "Input device support"
depends on !UML
config INPUT config INPUT
tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT

1
drivers/input/gameport/Kconfig
View File

@ -4,6 +4,7 @@
# #
config GAMEPORT config GAMEPORT
tristate "Gameport support" tristate "Gameport support"
depends on !UML
help help
Gameport support is for the standard 15-pin PC gameport. If you Gameport support is for the standard 15-pin PC gameport. If you
have a joystick, gamepad, gameport card, a soundcard with a gameport have a joystick, gamepad, gameport card, a soundcard with a gameport

1
drivers/input/joystick/Kconfig
View File

@ -4,6 +4,7 @@
# #
menuconfig INPUT_JOYSTICK menuconfig INPUT_JOYSTICK
bool "Joysticks/Gamepads" bool "Joysticks/Gamepads"
depends on !UML
help help
If you have a joystick, 6dof controller, gamepad, steering wheel, If you have a joystick, 6dof controller, gamepad, steering wheel,
weapon control system or something like that you can say Y here weapon control system or something like that you can say Y here

5
drivers/tty/Kconfig
View File

@ -12,9 +12,8 @@ if TTY
config VT config VT
bool "Virtual terminal" if EXPERT bool "Virtual terminal" if EXPERT
depends on !UML
select INPUT select INPUT
default y default y if !UML
help help
If you say Y here, you will get support for terminal devices with If you say Y here, you will get support for terminal devices with
display and keyboard devices. These are called "virtual" because you display and keyboard devices. These are called "virtual" because you
@ -78,7 +77,7 @@ config VT_CONSOLE_SLEEP
config HW_CONSOLE config HW_CONSOLE
bool bool
depends on VT && !UML depends on VT
default y default y
config VT_HW_CONSOLE_BINDING config VT_HW_CONSOLE_BINDING

2
drivers/video/console/Kconfig
View File

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