Skip to content

Commit 41bcfa4

Browse files
Linus Walleijolofj
authored andcommitted
ARM: configs: Update Realview 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. - Add the syscon LEDs as used on the board for heartbeat and MMC traffic indication. - Add fixed voltage regulator support, this is used by the MMC controller for card voltage. - 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/20200901082558.80388-1-linus.walleij@linaro.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
1 parent e42fd76 commit 41bcfa4

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

arch/arm/configs/realview_defconfig

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ CONFIG_HIGH_RES_TIMERS=y
55
CONFIG_LOG_BUF_SHIFT=14
66
CONFIG_PERF_EVENTS=y
77
CONFIG_SLAB=y
8-
CONFIG_MODULES=y
9-
CONFIG_MODULE_UNLOAD=y
10-
# CONFIG_BLK_DEV_BSG is not set
118
CONFIG_ARCH_MULTI_V6=y
129
CONFIG_ARCH_REALVIEW=y
1310
CONFIG_MACH_REALVIEW_EB=y
@@ -20,11 +17,12 @@ CONFIG_MACH_REALVIEW_PB1176=y
2017
CONFIG_MACH_REALVIEW_PBA8=y
2118
CONFIG_MACH_REALVIEW_PBX=y
2219
CONFIG_SMP=y
23-
CONFIG_CMA=y
24-
CONFIG_ZBOOT_ROM_TEXT=0x0
25-
CONFIG_ZBOOT_ROM_BSS=0x0
2620
CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
2721
CONFIG_VFP=y
22+
CONFIG_MODULES=y
23+
CONFIG_MODULE_UNLOAD=y
24+
# CONFIG_BLK_DEV_BSG is not set
25+
CONFIG_CMA=y
2826
CONFIG_NET=y
2927
CONFIG_PACKET=y
3028
CONFIG_UNIX=y
@@ -59,8 +57,12 @@ CONFIG_I2C_VERSATILE=y
5957
CONFIG_SPI=y
6058
CONFIG_GPIOLIB=y
6159
# CONFIG_HWMON is not set
60+
CONFIG_REGULATOR=y
61+
CONFIG_REGULATOR_FIXED_VOLTAGE=y
6262
CONFIG_DRM=y
6363
CONFIG_DRM_PANEL_SIMPLE=y
64+
CONFIG_DRM_DISPLAY_CONNECTOR=y
65+
CONFIG_DRM_SIMPLE_BRIDGE=y
6466
CONFIG_DRM_PL111=y
6567
CONFIG_FB_MODE_HELPERS=y
6668
CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -78,6 +80,7 @@ CONFIG_MMC=y
7880
CONFIG_MMC_ARMMMCI=y
7981
CONFIG_NEW_LEDS=y
8082
CONFIG_LEDS_CLASS=y
83+
CONFIG_LEDS_SYSCON=y
8184
CONFIG_LEDS_TRIGGERS=y
8285
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
8386
CONFIG_LEDS_TRIGGER_CPU=y
@@ -93,10 +96,9 @@ CONFIG_NFS_FS=y
9396
CONFIG_ROOT_NFS=y
9497
CONFIG_NLS_CODEPAGE_437=y
9598
CONFIG_NLS_ISO8859_1=y
96-
CONFIG_DEBUG_FS=y
9799
CONFIG_MAGIC_SYSRQ=y
100+
CONFIG_DEBUG_FS=y
98101
CONFIG_DEBUG_KERNEL=y
99102
# CONFIG_SCHED_DEBUG is not set
100103
# CONFIG_FTRACE is not set
101104
CONFIG_DEBUG_USER=y
102-
# CONFIG_CRYPTO_HW is not set

0 commit comments

Comments
 (0)