Skip to content

Commit fb686ad

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC defconfig updates from Arnd Bergmann: "We regenerated the defconfig files for samsung, shmobile, lpc18xx, lpc32xx, omap2, and nhk8815. Lots of additional drivers added on samsung and nhk8815, as well as the new pl110 driver on all machines that have it. The remaining changes are mostly to enable newly added drivers, and in case of imx8mq together with the SoC getting merged" * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (47 commits) ARM: spear3xx_defconfig: Activate PL111 DRM driver ARM: nhk8815_defconfig: Add new options ARM: nhk8815_defconfig: Update defconfig ARM: pxa: remove CONFIG_SND_PXA2XX_AC97 in pxa_defconfig ARM: defconfig: integrator: Switch to DRM arm64: defconfig: Add IMX2+ watchdog arm64: defconfig: Enable PFUZE100 regulator arm64: defconfig: enable NXP FlexSPI driver arm64: defconfig: Add i.MX8MQ boot necessary configs arm64: defconfig: add imx8qxp support arm64: defconfig: add i.MX system controller RTC support arm64: defconfig: Enable Tegra TCU arm64: defconfig: Enable MAX8973 regulator ARM: socfpga_defconfig: enable BLK_DEV_LOOP config option ARM: defconfig: lpc32xx: enable DRM simple panel driver ARM: defconfig: lpc32xx: enable fixed voltage regulator support arm64: defconfig: Enable SUN6I Camera sensor interface arm64: defconfig: Enable I2C_GPIO ARM: omap2plus_defconfig: Update for moved options ARM: omap2plus_defconfig: Update for dropped options ...
2 parents 384d11f + 31b0067 commit fb686ad

14 files changed

+232
-171
lines changed

‎arch/arm/configs/axm55xx_defconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,6 @@ CONFIG_PMBUS=y
155155
CONFIG_SENSORS_LTC2978=y
156156
CONFIG_WATCHDOG=y
157157
CONFIG_ARM_SP805_WATCHDOG=y
158-
CONFIG_FB=y
159-
CONFIG_FB_ARMCLCD=y
160-
CONFIG_FRAMEBUFFER_CONSOLE=y
161-
CONFIG_LOGO=y
162158
# CONFIG_LOGO_LINUX_MONO is not set
163159
# CONFIG_LOGO_LINUX_VGA16 is not set
164160
CONFIG_HID_A4TECH=y

‎arch/arm/configs/bcm2835_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ CONFIG_THERMAL=y
9191
CONFIG_BCM2835_THERMAL=y
9292
CONFIG_WATCHDOG=y
9393
CONFIG_BCM2835_WDT=y
94+
CONFIG_MEDIA_SUPPORT=y
95+
CONFIG_MEDIA_CAMERA_SUPPORT=y
9496
CONFIG_DRM=y
9597
CONFIG_DRM_VC4=y
9698
CONFIG_FB_SIMPLE=y
@@ -129,6 +131,7 @@ CONFIG_DMADEVICES=y
129131
CONFIG_DMA_BCM2835=y
130132
CONFIG_STAGING=y
131133
CONFIG_SND_BCM2835=m
134+
CONFIG_VIDEO_BCM2835=m
132135
CONFIG_MAILBOX=y
133136
CONFIG_BCM2835_MBOX=y
134137
# CONFIG_IOMMU_SUPPORT is not set

‎arch/arm/configs/integrator_defconfig

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
2727
CONFIG_CPU_FREQ_GOV_USERSPACE=y
2828
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
2929
CONFIG_CPUFREQ_DT=y
30+
CONFIG_CMA=y
3031
CONFIG_NET=y
3132
CONFIG_PACKET=y
3233
CONFIG_UNIX=y
@@ -53,13 +54,17 @@ CONFIG_E100=y
5354
CONFIG_SMC91X=y
5455
# CONFIG_KEYBOARD_ATKBD is not set
5556
# CONFIG_SERIO_SERPORT is not set
56-
CONFIG_FB=y
57+
CONFIG_DRM=y
58+
CONFIG_DRM_DUMB_VGA_DAC=y
59+
CONFIG_DRM_PL111=y
5760
CONFIG_FB_MODE_HELPERS=y
58-
CONFIG_FB_ARMCLCD=y
5961
CONFIG_FB_MATROX=y
6062
CONFIG_FB_MATROX_MILLENIUM=y
6163
CONFIG_FB_MATROX_MYSTIQUE=y
64+
CONFIG_BACKLIGHT_LCD_SUPPORT=y
65+
CONFIG_BACKLIGHT_CLASS_DEVICE=y
6266
# CONFIG_VGA_CONSOLE is not set
67+
CONFIG_LOGO=y
6368
CONFIG_MMC=y
6469
CONFIG_MMC_ARMMMCI=y
6570
CONFIG_NEW_LEDS=y

‎arch/arm/configs/lpc18xx_defconfig

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIG_CROSS_COMPILE="arm-linux-gnueabihf-"
22
CONFIG_HIGH_RES_TIMERS=y
3+
CONFIG_PREEMPT=y
34
CONFIG_BLK_DEV_INITRD=y
45
# CONFIG_RD_BZIP2 is not set
56
# CONFIG_RD_LZMA is not set
@@ -17,22 +18,20 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1718
CONFIG_EMBEDDED=y
1819
# CONFIG_VM_EVENT_COUNTERS is not set
1920
# CONFIG_SLUB_DEBUG is not set
20-
# CONFIG_LBDAF is not set
21-
# CONFIG_BLK_DEV_BSG is not set
22-
# CONFIG_IOSCHED_DEADLINE is not set
23-
# CONFIG_IOSCHED_CFQ is not set
2421
# CONFIG_MMU is not set
25-
CONFIG_ARM_SINGLE_ARMV7M=y
2622
CONFIG_ARCH_LPC18XX=y
2723
CONFIG_SET_MEM_PARAM=y
2824
CONFIG_DRAM_BASE=0x28000000
2925
CONFIG_DRAM_SIZE=0x02000000
3026
CONFIG_FLASH_MEM_BASE=0x1b000000
3127
CONFIG_FLASH_SIZE=0x00080000
32-
CONFIG_PREEMPT=y
3328
CONFIG_ZBOOT_ROM_TEXT=0x0
3429
CONFIG_ZBOOT_ROM_BSS=0x0
3530
CONFIG_ARM_APPENDED_DTB=y
31+
# CONFIG_LBDAF is not set
32+
# CONFIG_BLK_DEV_BSG is not set
33+
# CONFIG_IOSCHED_DEADLINE is not set
34+
# CONFIG_IOSCHED_CFQ is not set
3635
CONFIG_BINFMT_FLAT=y
3736
CONFIG_BINFMT_ZFLAT=y
3837
CONFIG_BINFMT_SHARED_FLAT=y
@@ -69,7 +68,6 @@ CONFIG_BLK_DEV_SD=y
6968
# CONFIG_SCSI_LOWLEVEL is not set
7069
CONFIG_NETDEVICES=y
7170
# CONFIG_NET_VENDOR_ARC is not set
72-
# CONFIG_NET_CADENCE is not set
7371
# CONFIG_NET_VENDOR_BROADCOM is not set
7472
# CONFIG_NET_VENDOR_CIRRUS is not set
7573
# CONFIG_NET_VENDOR_FARADAY is not set
@@ -90,7 +88,6 @@ CONFIG_STMMAC_ETH=y
9088
CONFIG_SMSC_PHY=y
9189
# CONFIG_USB_NET_DRIVERS is not set
9290
# CONFIG_WLAN is not set
93-
# CONFIG_INPUT_MOUSEDEV is not set
9491
CONFIG_INPUT_EVDEV=y
9592
# CONFIG_KEYBOARD_ATKBD is not set
9693
CONFIG_KEYBOARD_GPIO=y
@@ -101,13 +98,11 @@ CONFIG_KEYBOARD_GPIO_POLLED=y
10198
# CONFIG_UNIX98_PTYS is not set
10299
# CONFIG_LEGACY_PTYS is not set
103100
CONFIG_SERIAL_NONSTANDARD=y
104-
# CONFIG_DEVKMEM is not set
105101
CONFIG_SERIAL_8250=y
106102
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
107103
CONFIG_SERIAL_8250_CONSOLE=y
108104
CONFIG_SERIAL_OF_PLATFORM=y
109105
# CONFIG_HW_RANDOM is not set
110-
CONFIG_I2C=y
111106
CONFIG_I2C_LPC2K=y
112107
CONFIG_SPI=y
113108
CONFIG_SPI_PL022=y
@@ -121,8 +116,10 @@ CONFIG_WATCHDOG=y
121116
CONFIG_LPC18XX_WATCHDOG=y
122117
CONFIG_REGULATOR=y
123118
CONFIG_REGULATOR_FIXED_VOLTAGE=y
124-
CONFIG_FB=y
125-
CONFIG_FB_ARMCLCD=y
119+
CONFIG_DRM=y
120+
CONFIG_DRM_PL111=y
121+
CONFIG_FB_MODE_HELPERS=y
122+
CONFIG_BACKLIGHT_LCD_SUPPORT=y
126123
CONFIG_USB=y
127124
CONFIG_USB_EHCI_HCD=y
128125
CONFIG_USB_EHCI_ROOT_HUB_TT=y
@@ -144,31 +141,29 @@ CONFIG_AMBA_PL08X=y
144141
CONFIG_LPC18XX_DMAMUX=y
145142
CONFIG_MEMORY=y
146143
CONFIG_ARM_PL172_MPMC=y
147-
CONFIG_PWM=y
148-
CONFIG_PWM_LPC18XX_SCT=y
149144
CONFIG_IIO=y
150145
CONFIG_MMA7455_I2C=y
151146
CONFIG_LPC18XX_ADC=y
152147
CONFIG_LPC18XX_DAC=y
153148
CONFIG_IIO_SYSFS_TRIGGER=y
149+
CONFIG_PWM=y
150+
CONFIG_PWM_LPC18XX_SCT=y
154151
CONFIG_PHY_LPC18XX_USB_OTG=y
155-
CONFIG_NVMEM=y
156152
CONFIG_NVMEM_LPC18XX_EEPROM=y
157153
CONFIG_EXT2_FS=y
158154
# CONFIG_FILE_LOCKING is not set
159155
# CONFIG_DNOTIFY is not set
160156
# CONFIG_INOTIFY_USER is not set
161157
CONFIG_JFFS2_FS=y
162158
# CONFIG_NETWORK_FILESYSTEMS is not set
159+
CONFIG_CRC_ITU_T=y
160+
CONFIG_CRC7=y
163161
CONFIG_PRINTK_TIME=y
164162
CONFIG_DEBUG_INFO=y
165-
# CONFIG_ENABLE_WARN_DEPRECATED is not set
166163
# CONFIG_ENABLE_MUST_CHECK is not set
167164
CONFIG_DEBUG_FS=y
168165
CONFIG_MAGIC_SYSRQ=y
169166
# CONFIG_SCHED_DEBUG is not set
170167
# CONFIG_DEBUG_BUGVERBOSE is not set
171168
CONFIG_DEBUG_LL=y
172169
CONFIG_EARLY_PRINTK=y
173-
CONFIG_CRC_ITU_T=y
174-
CONFIG_CRC7=y

‎arch/arm/configs/lpc32xx_defconfig

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
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=16
@@ -11,13 +12,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1112
CONFIG_SYSCTL_SYSCALL=y
1213
CONFIG_EMBEDDED=y
1314
CONFIG_SLAB=y
14-
CONFIG_JUMP_LABEL=y
15-
CONFIG_MODULES=y
16-
CONFIG_MODULE_UNLOAD=y
17-
# CONFIG_BLK_DEV_BSG is not set
18-
CONFIG_PARTITION_ADVANCED=y
1915
CONFIG_ARCH_LPC32XX=y
20-
CONFIG_PREEMPT=y
2116
CONFIG_AEABI=y
2217
CONFIG_ZBOOT_ROM_TEXT=0x0
2318
CONFIG_ZBOOT_ROM_BSS=0x0
@@ -26,6 +21,11 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
2621
CONFIG_CMDLINE="console=ttyS0,115200n81 root=/dev/ram0"
2722
CONFIG_CPU_IDLE=y
2823
CONFIG_VFP=y
24+
CONFIG_JUMP_LABEL=y
25+
CONFIG_MODULES=y
26+
CONFIG_MODULE_UNLOAD=y
27+
# CONFIG_BLK_DEV_BSG is not set
28+
CONFIG_PARTITION_ADVANCED=y
2929
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
3030
CONFIG_NET=y
3131
CONFIG_PACKET=y
@@ -56,6 +56,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=y
5656
CONFIG_BLK_DEV_RAM=y
5757
CONFIG_BLK_DEV_RAM_COUNT=1
5858
CONFIG_BLK_DEV_RAM_SIZE=16384
59+
CONFIG_SRAM=y
5960
CONFIG_EEPROM_AT24=y
6061
CONFIG_EEPROM_AT25=y
6162
CONFIG_SCSI=y
@@ -75,9 +76,6 @@ CONFIG_LPC_ENET=y
7576
# CONFIG_NET_VENDOR_STMICRO is not set
7677
CONFIG_SMSC_PHY=y
7778
# CONFIG_WLAN is not set
78-
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
79-
CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
80-
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
8179
CONFIG_INPUT_EVDEV=y
8280
# CONFIG_KEYBOARD_ATKBD is not set
8381
CONFIG_KEYBOARD_GPIO=y
@@ -92,48 +90,39 @@ CONFIG_SERIAL_8250=y
9290
CONFIG_SERIAL_8250_CONSOLE=y
9391
CONFIG_SERIAL_OF_PLATFORM=y
9492
CONFIG_SERIAL_HS_LPC32XX=y
93+
CONFIG_SERIAL_HS_LPC32XX_CONSOLE=y
9594
# CONFIG_HW_RANDOM is not set
96-
CONFIG_I2C=y
9795
CONFIG_I2C_CHARDEV=y
9896
CONFIG_I2C_PNX=y
9997
CONFIG_SPI=y
10098
CONFIG_SPI_PL022=y
10199
CONFIG_GPIO_SYSFS=y
102-
CONFIG_GPIO_EM=y
103100
CONFIG_GPIO_GENERIC_PLATFORM=y
104-
CONFIG_GPIO_PL061=y
105-
CONFIG_GPIO_ADP5588=y
106-
CONFIG_GPIO_ADNP=y
107-
CONFIG_GPIO_MAX7300=y
108-
CONFIG_GPIO_MAX732X=y
109101
CONFIG_GPIO_PCA953X=y
110102
CONFIG_GPIO_PCF857X=y
111-
CONFIG_GPIO_74X164=y
112-
CONFIG_GPIO_MAX7301=y
113-
CONFIG_GPIO_MC33880=y
114-
CONFIG_PINCTRL_MCP23S08=y
115-
CONFIG_PINCTRL_SX150X=y
116103
CONFIG_SENSORS_DS620=y
117104
CONFIG_SENSORS_MAX6639=y
118105
CONFIG_WATCHDOG=y
119106
CONFIG_PNX4008_WATCHDOG=y
120-
CONFIG_FB=y
121-
CONFIG_FB_ARMCLCD=y
107+
CONFIG_REGULATOR=y
108+
CONFIG_REGULATOR_FIXED_VOLTAGE=y
109+
CONFIG_DRM=y
110+
CONFIG_DRM_PANEL_SIMPLE=y
111+
CONFIG_DRM_PL111=y
112+
CONFIG_FB_MODE_HELPERS=y
113+
CONFIG_BACKLIGHT_LCD_SUPPORT=y
114+
CONFIG_BACKLIGHT_CLASS_DEVICE=y
122115
CONFIG_FRAMEBUFFER_CONSOLE=y
123-
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
124116
CONFIG_LOGO=y
125117
# CONFIG_LOGO_LINUX_MONO is not set
126118
# CONFIG_LOGO_LINUX_VGA16 is not set
127119
CONFIG_SOUND=y
128120
CONFIG_SND=y
129-
CONFIG_SND_SEQUENCER=y
130-
CONFIG_SND_MIXER_OSS=y
131-
CONFIG_SND_PCM_OSS=y
132-
CONFIG_SND_SEQUENCER_OSS=y
133121
# CONFIG_SND_SUPPORT_OLD_API is not set
134122
# CONFIG_SND_VERBOSE_PROCFS is not set
135123
CONFIG_SND_DEBUG=y
136124
CONFIG_SND_DEBUG_VERBOSE=y
125+
CONFIG_SND_SEQUENCER=y
137126
# CONFIG_SND_DRIVERS is not set
138127
# CONFIG_SND_ARM is not set
139128
# CONFIG_SND_SPI is not set
@@ -146,7 +135,6 @@ CONFIG_USB_LPC32XX=y
146135
CONFIG_USB_MASS_STORAGE=m
147136
CONFIG_USB_G_SERIAL=m
148137
CONFIG_MMC=y
149-
# CONFIG_MMC_BLOCK_BOUNCE is not set
150138
CONFIG_MMC_ARMMMCI=y
151139
CONFIG_MMC_SPI=y
152140
CONFIG_NEW_LEDS=y
@@ -169,10 +157,10 @@ CONFIG_RTC_DRV_LPC32XX=y
169157
CONFIG_DMADEVICES=y
170158
CONFIG_AMBA_PL08X=y
171159
CONFIG_STAGING=y
172-
CONFIG_LPC32XX_ADC=y
173160
CONFIG_MEMORY=y
174161
CONFIG_ARM_PL172_MPMC=y
175162
CONFIG_IIO=y
163+
CONFIG_LPC32XX_ADC=y
176164
CONFIG_MAX517=y
177165
CONFIG_PWM=y
178166
CONFIG_PWM_LPC32XX=y
@@ -186,18 +174,27 @@ CONFIG_JFFS2_FS_WBUF_VERIFY=y
186174
CONFIG_UBIFS_FS=y
187175
CONFIG_CRAMFS=y
188176
CONFIG_NFS_FS=y
177+
CONFIG_NFS_V4=y
178+
CONFIG_NFS_V4_1=y
179+
CONFIG_NFS_V4_2=y
189180
CONFIG_ROOT_NFS=y
190181
CONFIG_NLS_CODEPAGE_437=y
191182
CONFIG_NLS_ASCII=y
192183
CONFIG_NLS_ISO8859_1=y
193184
CONFIG_NLS_UTF8=y
185+
CONFIG_CRYPTO_ANSI_CPRNG=y
186+
# CONFIG_CRYPTO_HW is not set
187+
CONFIG_CRC_CCITT=y
188+
CONFIG_PRINTK_TIME=y
189+
CONFIG_DYNAMIC_DEBUG=y
194190
CONFIG_DEBUG_INFO=y
191+
CONFIG_GDB_SCRIPTS=y
192+
CONFIG_DEBUG_FS=y
193+
CONFIG_MAGIC_SYSRQ=y
194+
CONFIG_PANIC_ON_OOPS=y
195+
CONFIG_PANIC_TIMEOUT=5
195196
# CONFIG_SCHED_DEBUG is not set
196197
# CONFIG_DEBUG_PREEMPT is not set
197198
# CONFIG_FTRACE is not set
198-
# CONFIG_ARM_UNWIND is not set
199199
CONFIG_DEBUG_LL=y
200200
CONFIG_EARLY_PRINTK=y
201-
CONFIG_CRYPTO_ANSI_CPRNG=y
202-
# CONFIG_CRYPTO_HW is not set
203-
CONFIG_CRC_CCITT=y

‎arch/arm/configs/multi_v7_defconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ CONFIG_ARCH_ROCKCHIP=y
7676
CONFIG_ARCH_RENESAS=y
7777
CONFIG_ARCH_EMEV2=y
7878
CONFIG_ARCH_R7S72100=y
79+
CONFIG_ARCH_R7S9210=y
7980
CONFIG_ARCH_R8A73A4=y
8081
CONFIG_ARCH_R8A7740=y
8182
CONFIG_ARCH_R8A7743=y
@@ -404,6 +405,7 @@ CONFIG_SPI_XILINX=y
404405
CONFIG_SPI_SPIDEV=y
405406
CONFIG_SPMI=y
406407
CONFIG_PINCTRL_AS3722=y
408+
CONFIG_PINCTRL_RZA2=y
407409
CONFIG_PINCTRL_PALMAS=y
408410
CONFIG_PINCTRL_APQ8064=y
409411
CONFIG_PINCTRL_APQ8084=y
@@ -631,6 +633,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
631633
CONFIG_DRM_DUMB_VGA_DAC=m
632634
CONFIG_DRM_NXP_PTN3460=m
633635
CONFIG_DRM_PARADE_PS8622=m
636+
CONFIG_DRM_SII902X=m
634637
CONFIG_DRM_SII9234=m
635638
CONFIG_DRM_TOSHIBA_TC358764=m
636639
CONFIG_DRM_I2C_ADV7511=m
@@ -641,7 +644,7 @@ CONFIG_DRM_STM_DSI=m
641644
CONFIG_DRM_VC4=m
642645
CONFIG_DRM_ETNAVIV=m
643646
CONFIG_DRM_MXSFB=m
644-
CONFIG_FB_ARMCLCD=y
647+
CONFIG_DRM_PL111=m
645648
CONFIG_FB_EFI=y
646649
CONFIG_FB_WM8505=y
647650
CONFIG_FB_SH_MOBILE_LCDC=y
@@ -826,6 +829,7 @@ CONFIG_RTC_DRV_MAX8997=m
826829
CONFIG_RTC_DRV_MAX77686=y
827830
CONFIG_RTC_DRV_RK808=m
828831
CONFIG_RTC_DRV_RS5C372=m
832+
CONFIG_RTC_DRV_PCF85363=m
829833
CONFIG_RTC_DRV_BQ32K=m
830834
CONFIG_RTC_DRV_TWL4030=y
831835
CONFIG_RTC_DRV_PALMAS=y
@@ -1028,3 +1032,5 @@ CONFIG_CRYPTO_AES_ARM_CE=m
10281032
CONFIG_CRYPTO_GHASH_ARM_CE=m
10291033
CONFIG_CRYPTO_CRC32_ARM_CE=m
10301034
CONFIG_CRYPTO_CHACHA20_NEON=m
1035+
CONFIG_GCC_PLUGINS=y
1036+
CONFIG_GCC_PLUGIN_STRUCTLEAK=y

0 commit comments

Comments
 (0)