Commit e42fd768 authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson

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.orgSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent f75aef39
...@@ -9,8 +9,6 @@ CONFIG_SLAB=y ...@@ -9,8 +9,6 @@ CONFIG_SLAB=y
CONFIG_ARCH_VERSATILE=y CONFIG_ARCH_VERSATILE=y
CONFIG_AEABI=y CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y CONFIG_OABI_COMPAT=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="root=1f03 mem=32M" CONFIG_CMDLINE="root=1f03 mem=32M"
CONFIG_FPE_NWFPE=y CONFIG_FPE_NWFPE=y
CONFIG_VFP=y CONFIG_VFP=y
...@@ -59,6 +57,7 @@ CONFIG_GPIO_PL061=y ...@@ -59,6 +57,7 @@ CONFIG_GPIO_PL061=y
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_PANEL_ARM_VERSATILE=y CONFIG_DRM_PANEL_ARM_VERSATILE=y
CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_DISPLAY_CONNECTOR=y
CONFIG_DRM_SIMPLE_BRIDGE=y CONFIG_DRM_SIMPLE_BRIDGE=y
CONFIG_DRM_PL111=y CONFIG_DRM_PL111=y
CONFIG_FB_MODE_HELPERS=y CONFIG_FB_MODE_HELPERS=y
...@@ -91,8 +90,8 @@ CONFIG_NLS_CODEPAGE_850=m ...@@ -91,8 +90,8 @@ CONFIG_NLS_CODEPAGE_850=m
CONFIG_NLS_ISO8859_1=m CONFIG_NLS_ISO8859_1=m
CONFIG_FONTS=y CONFIG_FONTS=y
CONFIG_FONT_ACORN_8x8=y CONFIG_FONT_ACORN_8x8=y
CONFIG_DEBUG_FS=y
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_FS=y
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_USER=y CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL=y
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment