Skip to content

Commit 850d8ec

Browse files
linuswarndb
authored andcommitted
ARM: configs: Update Versatile defconfig
This updates the Versatile defconfig for the changes in the v5.14-rc1 kernel: - The Framebuffer CONFIG_FB needs to be explicitly selected or we don't get any framebuffer anymore. DRM has stopped to select FB because of circular dependency. - The CONFIG_FB_MODE_HELPERS are not needed when using DRM framebuffer emulation as DRM does. - The Acorn fonts are removed, the default framebuffer font works fine. I don't know why this was selected in the first place or how the Kconfig was altered so it was removed. Fixes: f611b1e ("drm: Avoid circular dependencies for CONFIG_FB") Signed-off-by: Linus Walleij <[email protected]> Reviewed-by: Kees Cook <[email protected]> Cc: Kees Cook <[email protected]> Link: https://lore.kernel.org/r/[email protected]' Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 56fa6e8 commit 850d8ec

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

arch/arm/configs/versatile_defconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
6060
CONFIG_DRM_DISPLAY_CONNECTOR=y
6161
CONFIG_DRM_SIMPLE_BRIDGE=y
6262
CONFIG_DRM_PL111=y
63-
CONFIG_FB_MODE_HELPERS=y
63+
CONFIG_FB=y
6464
CONFIG_BACKLIGHT_CLASS_DEVICE=y
6565
CONFIG_LOGO=y
6666
CONFIG_SOUND=y
@@ -88,8 +88,6 @@ CONFIG_NFSD=y
8888
CONFIG_NFSD_V3=y
8989
CONFIG_NLS_CODEPAGE_850=m
9090
CONFIG_NLS_ISO8859_1=m
91-
CONFIG_FONTS=y
92-
CONFIG_FONT_ACORN_8x8=y
9391
CONFIG_MAGIC_SYSRQ=y
9492
CONFIG_DEBUG_FS=y
9593
CONFIG_DEBUG_KERNEL=y

0 commit comments

Comments
 (0)