[arm64] video: Change FB from module to built-in
Currently we don't explicitly set CONFIG_FB for arm64, and the only reason it's enabled as a module is that the DRM drivers (which are built as modules) select it. We *do* explicitly set CONFIG_FB=y on almost all other architectures and flavours. Simplify this by setting CONFIG_FB=y at the top level and overriding where needed (not arm64).
This commit is contained in:
parent
a90b078bc7
commit
b30786ada7
|
@ -357,6 +357,7 @@ linux (4.9.5-1) UNRELEASED; urgency=medium
|
|||
* [x86] ASoC: Intel: select DW_DMAC_CORE since it's mandatory
|
||||
* [x86] sound/soc/intel: Enable SND_SOC_INTEL_BDW_RT5677_MACH as module
|
||||
(Closes: #851916)
|
||||
* [arm64] video/fbdev: Change FB from module to built-in
|
||||
|
||||
[ Salvatore Bonaccorso ]
|
||||
* tmpfs: clear S_ISGID when setting posix ACLs (CVE-2017-5551)
|
||||
|
|
|
@ -878,7 +878,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=m
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_MODE_HELPERS=y
|
||||
CONFIG_FB_TILEBLITTING=y
|
||||
CONFIG_FB_CIRRUS=m
|
||||
|
|
|
@ -1182,7 +1182,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_ARMCLCD=y
|
||||
CONFIG_FB_VT8500=y
|
||||
CONFIG_FB_WM8505=y
|
||||
|
|
|
@ -4866,6 +4866,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
CONFIG_FIRMWARE_EDID=y
|
||||
# CONFIG_FB_FOREIGN_ENDIAN is not set
|
||||
CONFIG_FB_ARC=m
|
||||
|
|
|
@ -521,7 +521,6 @@ CONFIG_STI_CONSOLE=y
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_MODE_HELPERS=y
|
||||
# CONFIG_FB_TILEBLITTING is not set
|
||||
# CONFIG_FB_CIRRUS is not set
|
||||
|
|
|
@ -55,11 +55,6 @@ CONFIG_USB_OHCI_HCD=m
|
|||
# CONFIG_VGA_CONSOLE is not set
|
||||
CONFIG_FRAMEBUFFER_CONSOLE=y
|
||||
|
||||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
|
||||
##
|
||||
## file: init/Kconfig
|
||||
##
|
||||
|
|
|
@ -794,7 +794,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_MODE_HELPERS=y
|
||||
CONFIG_FB_TILEBLITTING=y
|
||||
CONFIG_FB_CIRRUS=m
|
||||
|
|
|
@ -472,7 +472,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_MODE_HELPERS=y
|
||||
# CONFIG_FB_TILEBLITTING is not set
|
||||
# CONFIG_FB_CIRRUS is not set
|
||||
|
|
|
@ -1758,7 +1758,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_MODE_HELPERS=y
|
||||
CONFIG_FB_TILEBLITTING=y
|
||||
CONFIG_FB_CIRRUS=m
|
||||
|
|
|
@ -563,7 +563,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
# CONFIG_FIRMWARE_EDID is not set
|
||||
CONFIG_FB_FOREIGN_ENDIAN=y
|
||||
## choice: Choice endianness support
|
||||
|
|
|
@ -160,6 +160,11 @@ CONFIG_ZFCP=m
|
|||
##
|
||||
CONFIG_HVC_IUCV=y
|
||||
|
||||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
# CONFIG_FB is not set
|
||||
|
||||
##
|
||||
## file: drivers/watchdog/Kconfig
|
||||
##
|
||||
|
|
|
@ -162,7 +162,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_SM501=y
|
||||
|
||||
##
|
||||
|
|
|
@ -207,7 +207,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
|
|||
##
|
||||
## file: drivers/video/fbdev/Kconfig
|
||||
##
|
||||
CONFIG_FB=y
|
||||
CONFIG_FB_SM501=y
|
||||
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue