Skip to content

Commit e42fd76

Browse files
Linus Walleijolofj
authored andcommitted
ARM: configs: Update Versatile defconfig
Update the Integrator defconfig to the changes from the recent kernel cycles and especially the v5.9-rc1 changes. - Move options around as a result of Kconfig changes. - Drop the ZBOOT_ROM* stuff that doesn't exist anymore. - Select CONFIG_DRM_DISPLAY_CONNECTOR=y, the CONFIG_DRM_SIMPLE_BRIDGE was renamed when renaming the driver, but the simple bridge requires another bridge, the display connector bridge, in order to work, so this is required to have graphics working properly in kernel v5.9-rc1+ Link: https://lore.kernel.org/r/20200901073930.31548-1-linus.walleij@linaro.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
1 parent f75aef3 commit e42fd76

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

arch/arm/configs/versatile_defconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ CONFIG_SLAB=y
99
CONFIG_ARCH_VERSATILE=y
1010
CONFIG_AEABI=y
1111
CONFIG_OABI_COMPAT=y
12-
CONFIG_ZBOOT_ROM_TEXT=0x0
13-
CONFIG_ZBOOT_ROM_BSS=0x0
1412
CONFIG_CMDLINE="root=1f03 mem=32M"
1513
CONFIG_FPE_NWFPE=y
1614
CONFIG_VFP=y
@@ -59,6 +57,7 @@ CONFIG_GPIO_PL061=y
5957
CONFIG_DRM=y
6058
CONFIG_DRM_PANEL_ARM_VERSATILE=y
6159
CONFIG_DRM_PANEL_SIMPLE=y
60+
CONFIG_DRM_DISPLAY_CONNECTOR=y
6261
CONFIG_DRM_SIMPLE_BRIDGE=y
6362
CONFIG_DRM_PL111=y
6463
CONFIG_FB_MODE_HELPERS=y
@@ -91,8 +90,8 @@ CONFIG_NLS_CODEPAGE_850=m
9190
CONFIG_NLS_ISO8859_1=m
9291
CONFIG_FONTS=y
9392
CONFIG_FONT_ACORN_8x8=y
94-
CONFIG_DEBUG_FS=y
9593
CONFIG_MAGIC_SYSRQ=y
94+
CONFIG_DEBUG_FS=y
9695
CONFIG_DEBUG_KERNEL=y
9796
CONFIG_DEBUG_USER=y
9897
CONFIG_DEBUG_LL=y

0 commit comments

Comments
 (0)