Various files within drivers/ depend on the declaration of the screen_info variable. Add this information to Kconfig. In the case of the dummy console, the dependency exists only on ARM. Ignore it on !ARM platforms. Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx> Cc: Ard Biesheuvel <ardb@xxxxxxxxxx> Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> Cc: Maxime Ripard <mripard@xxxxxxxxxx> Cc: David Airlie <airlied@xxxxxxxxx> Cc: Daniel Vetter <daniel@xxxxxxxx> Cc: "K. Y. Srinivasan" <kys@xxxxxxxxxxxxx> Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx> Cc: Wei Liu <wei.liu@xxxxxxxxxx> Cc: Dexuan Cui <decui@xxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Helge Deller <deller@xxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Javier Martinez Canillas <javierm@xxxxxxxxxx> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> --- drivers/firmware/Kconfig | 1 + drivers/firmware/efi/Kconfig | 1 + drivers/gpu/drm/Kconfig | 1 + drivers/hv/Kconfig | 1 + drivers/video/console/Kconfig | 2 ++ drivers/video/fbdev/Kconfig | 4 ++++ 6 files changed, 10 insertions(+) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 0432737bbb8b4..65bbf7422f1db 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -228,6 +228,7 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT config SYSFB bool + depends on ARCH_HAS_SCREEN_INFO select BOOT_VESA_SUPPORT config SYSFB_SIMPLEFB diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index 043ca31c114eb..963d305421e50 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -225,6 +225,7 @@ config EFI_DISABLE_PCI_DMA config EFI_EARLYCON def_bool y depends on SERIAL_EARLYCON && !ARM && !IA64 + depends on ARCH_HAS_SCREEN_INFO select FONT_SUPPORT select ARCH_USE_MEMREMAP_PROT diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index afb3b2f5f4253..63dfc3391d2ff 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -366,6 +366,7 @@ source "drivers/gpu/drm/sprd/Kconfig" config DRM_HYPERV tristate "DRM Support for Hyper-V synthetic video device" depends on DRM && PCI && MMU && HYPERV + depends on ARCH_HAS_SCREEN_INFO select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER help diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 00242107d62e0..3730c9b42a9bd 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig @@ -6,6 +6,7 @@ config HYPERV tristate "Microsoft Hyper-V client drivers" depends on (X86 && X86_LOCAL_APIC && HYPERVISOR_GUEST) \ || (ACPI && ARM64 && !CPU_BIG_ENDIAN) + depends on ARCH_HAS_SCREEN_INFO select PARAVIRT select X86_HV_CALLBACK_VECTOR if X86 select OF_EARLY_FLATTREE if OF diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index a2a88d42edf0c..b39e2ae039783 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -10,6 +10,7 @@ config VGA_CONSOLE depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !SUPERH && \ (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !S390 && !UML + depends on ARCH_HAS_SCREEN_INFO select APERTURE_HELPERS if (DRM || FB || VFIO_PCI_CORE) default y help @@ -48,6 +49,7 @@ config SGI_NEWPORT_CONSOLE config DUMMY_CONSOLE bool + depends on ARCH_HAS_SCREEN_INFO || !ARM default y config DUMMY_CONSOLE_COLUMNS diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index cecf15418632d..e11d85e802bc7 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -655,6 +655,7 @@ config FB_UVESA config FB_VESA bool "VESA VGA graphics support" depends on (FB = y) && X86 + depends on ARCH_HAS_SCREEN_INFO select APERTURE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA @@ -669,6 +670,7 @@ config FB_VESA config FB_EFI bool "EFI-based Framebuffer Support" depends on (FB = y) && !IA64 && EFI + depends on ARCH_HAS_SCREEN_INFO select APERTURE_HELPERS select DRM_PANEL_ORIENTATION_QUIRKS select FB_CFB_FILLRECT @@ -1089,6 +1091,7 @@ config FB_CARILLO_RANCH config FB_INTEL tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support" depends on FB && PCI && X86 && AGP_INTEL && EXPERT + depends on ARCH_HAS_SCREEN_INFO select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA @@ -2185,6 +2188,7 @@ config FB_BROADSHEET config FB_HYPERV tristate "Microsoft Hyper-V Synthetic Video support" depends on FB && HYPERV + depends on ARCH_HAS_SCREEN_INFO select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT -- 2.41.0
|