Skip to content

Commit bf53f46

Browse files
linuswolofj
authored andcommitted
ARM: configs: Update Integrator 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 GPIO input and evdev as used by the pushbuttons on the machine. - 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/20200820085752.42994-1-linus.walleij@linaro.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
1 parent cc3e433 commit bf53f46

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

arch/arm/configs/integrator_defconfig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
CONFIG_SYSVIPC=y
22
CONFIG_NO_HZ=y
33
CONFIG_HIGH_RES_TIMERS=y
4+
CONFIG_PREEMPT=y
45
CONFIG_IKCONFIG=y
56
CONFIG_IKCONFIG_PROC=y
67
CONFIG_LOG_BUF_SHIFT=14
78
CONFIG_BLK_DEV_INITRD=y
8-
CONFIG_MODULES=y
9-
CONFIG_MODULE_UNLOAD=y
10-
CONFIG_PARTITION_ADVANCED=y
119
CONFIG_ARCH_MULTI_V4T=y
1210
CONFIG_ARCH_MULTI_V5=y
1311
# CONFIG_ARCH_MULTI_V7 is not set
1412
CONFIG_ARCH_INTEGRATOR=y
1513
CONFIG_ARCH_INTEGRATOR_AP=y
1614
CONFIG_INTEGRATOR_IMPD1=y
1715
CONFIG_ARCH_INTEGRATOR_CP=y
18-
CONFIG_PCI=y
19-
CONFIG_PREEMPT=y
2016
CONFIG_AEABI=y
2117
# CONFIG_ATAGS is not set
22-
CONFIG_ZBOOT_ROM_TEXT=0x0
23-
CONFIG_ZBOOT_ROM_BSS=0x0
2418
CONFIG_CMDLINE="console=ttyAM0,38400n8 root=/dev/nfs ip=bootp"
2519
CONFIG_CPU_FREQ=y
2620
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
2721
CONFIG_CPU_FREQ_GOV_USERSPACE=y
2822
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
2923
CONFIG_CPUFREQ_DT=y
30-
CONFIG_CMA=y
24+
CONFIG_MODULES=y
25+
CONFIG_MODULE_UNLOAD=y
26+
CONFIG_PARTITION_ADVANCED=y
3127
CONFIG_NET=y
3228
CONFIG_PACKET=y
3329
CONFIG_UNIX=y
@@ -37,6 +33,7 @@ CONFIG_IP_PNP=y
3733
CONFIG_IP_PNP_DHCP=y
3834
CONFIG_IP_PNP_BOOTP=y
3935
# CONFIG_IPV6 is not set
36+
CONFIG_PCI=y
4037
CONFIG_MTD=y
4138
CONFIG_MTD_CMDLINE_PARTS=y
4239
CONFIG_MTD_AFS_PARTS=y
@@ -52,9 +49,12 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
5249
CONFIG_NETDEVICES=y
5350
CONFIG_E100=y
5451
CONFIG_SMC91X=y
52+
CONFIG_INPUT_EVDEV=y
5553
# CONFIG_KEYBOARD_ATKBD is not set
54+
CONFIG_KEYBOARD_GPIO=y
5655
# CONFIG_SERIO_SERPORT is not set
5756
CONFIG_DRM=y
57+
CONFIG_DRM_DISPLAY_CONNECTOR=y
5858
CONFIG_DRM_SIMPLE_BRIDGE=y
5959
CONFIG_DRM_PL111=y
6060
CONFIG_FB_MODE_HELPERS=y

0 commit comments

Comments
 (0)