Skip to content

Commit 32b4707

Browse files
committed
Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM defconfig updates from Arnd Bergmann: "The usual set of defconfig updates, including one new defconfig file for the new sama7 family of SoCs" * tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: config: aspeed: Regenerate defconfigs ARM: config: aspeed_g4: Enable EDAC and SPGIO ARM: config: aspeed: Enable KCS adapter for raw SerIO ARM: config: aspeed: Enable hardened allocator feature ARM: imx_v6_v7_defconfig: enable driver of the LTC3676 PMIC ARM: multi_v7_defconfig: Enable CONFIG_TEGRA30_TSENSOR ARM: multi_v7_defconfig: Enable Acer A500 drivers ARM: tegra: Rebuild default configuration ARM: tegra: Enable CONFIG_CROS_EC ARM: tegra: Enable Acer A500 drivers ARM: tegra: Enable CONFIG_FB ARM: tegra: Enable CONFIG_TEGRA30_TSENSOR ARM: configs: multi_v7: enable PL35x NAND controller arm64: defconfig: Enable Qualcomm MSM8996 CPU clock driver ARM: imx_v6_v7_defconfig: Let CONFIG_SCSI_LOWLEVEL be selected ARM: imx_v6_v7_defconfig: Select CONFIG_KPROBES ARM: multi_v7_defconfig: Enable CONFIG_MMC_MESON_MX_SDHC ARM: multi_v7_defconfig: add sama7g5 SoC ARM: configs: at91: add defconfig for sama7 family of SoCs
2 parents 866147b + 79cd0bb commit 32b4707

File tree

7 files changed

+242
-45
lines changed

7 files changed

+242
-45
lines changed

arch/arm/configs/aspeed_g4_defconfig

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CONFIG_KERNEL_XZ=y
33
CONFIG_SYSVIPC=y
44
CONFIG_NO_HZ_IDLE=y
55
CONFIG_HIGH_RES_TIMERS=y
6+
CONFIG_BPF_SYSCALL=y
67
CONFIG_IKCONFIG=y
78
CONFIG_IKCONFIG_PROC=y
89
CONFIG_LOG_BUF_SHIFT=16
@@ -14,22 +15,18 @@ CONFIG_BLK_DEV_INITRD=y
1415
# CONFIG_UID16 is not set
1516
# CONFIG_SYSFS_SYSCALL is not set
1617
# CONFIG_AIO is not set
17-
CONFIG_BPF_SYSCALL=y
1818
CONFIG_EMBEDDED=y
1919
CONFIG_PERF_EVENTS=y
2020
# CONFIG_COMPAT_BRK is not set
21-
CONFIG_SLAB=y
2221
CONFIG_SLAB_FREELIST_RANDOM=y
22+
CONFIG_SLAB_FREELIST_HARDENED=y
2323
# CONFIG_ARCH_MULTI_V7 is not set
2424
CONFIG_ARCH_ASPEED=y
2525
CONFIG_MACH_ASPEED_G4=y
2626
CONFIG_VMSPLIT_2G=y
2727
CONFIG_AEABI=y
2828
CONFIG_UACCESS_WITH_MEMCPY=y
29-
CONFIG_SECCOMP=y
3029
# CONFIG_ATAGS is not set
31-
CONFIG_ZBOOT_ROM_TEXT=0x0
32-
CONFIG_ZBOOT_ROM_BSS=0x0
3330
CONFIG_ARM_APPENDED_DTB=y
3431
CONFIG_ARM_ATAG_DTB_COMPAT=y
3532
CONFIG_KEXEC=y
@@ -76,7 +73,6 @@ CONFIG_NETCONSOLE=y
7673
# CONFIG_NET_VENDOR_AMAZON is not set
7774
# CONFIG_NET_VENDOR_AQUANTIA is not set
7875
# CONFIG_NET_VENDOR_ARC is not set
79-
# CONFIG_NET_VENDOR_AURORA is not set
8076
# CONFIG_NET_VENDOR_BROADCOM is not set
8177
# CONFIG_NET_VENDOR_CADENCE is not set
8278
# CONFIG_NET_VENDOR_CAVIUM is not set
@@ -132,7 +128,6 @@ CONFIG_ASPEED_BT_IPMI_BMC=y
132128
CONFIG_HW_RANDOM_TIMERIOMEM=y
133129
# CONFIG_I2C_COMPAT is not set
134130
CONFIG_I2C_CHARDEV=y
135-
CONFIG_I2C_MUX=y
136131
CONFIG_I2C_MUX_PCA9541=y
137132
CONFIG_I2C_MUX_PCA954x=y
138133
CONFIG_I2C_ASPEED=y
@@ -141,6 +136,7 @@ CONFIG_SPI=y
141136
CONFIG_GPIOLIB=y
142137
CONFIG_GPIO_SYSFS=y
143138
CONFIG_GPIO_ASPEED=y
139+
CONFIG_GPIO_ASPEED_SGPIO=y
144140
CONFIG_W1=y
145141
CONFIG_W1_MASTER_GPIO=y
146142
CONFIG_W1_SLAVE_THERM=y
@@ -205,16 +201,14 @@ CONFIG_LEDS_TRIGGER_TIMER=y
205201
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
206202
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
207203
CONFIG_EDAC=y
204+
CONFIG_EDAC_ASPEED=y
208205
CONFIG_RTC_CLASS=y
209206
CONFIG_RTC_DRV_DS1307=y
210207
CONFIG_RTC_DRV_PCF8523=y
211208
CONFIG_RTC_DRV_RV8803=y
212209
CONFIG_RTC_DRV_ASPEED=y
213210
# CONFIG_VIRTIO_MENU is not set
214211
# CONFIG_IOMMU_SUPPORT is not set
215-
CONFIG_ASPEED_LPC_CTRL=y
216-
CONFIG_ASPEED_LPC_SNOOP=y
217-
CONFIG_ASPEED_P2A_CTRL=y
218212
CONFIG_IIO=y
219213
CONFIG_ASPEED_ADC=y
220214
CONFIG_MAX1363=y
@@ -255,6 +249,7 @@ CONFIG_DEBUG_INFO_DWARF4=y
255249
CONFIG_GDB_SCRIPTS=y
256250
CONFIG_STRIP_ASM_SYMS=y
257251
CONFIG_DEBUG_FS=y
252+
CONFIG_DEBUG_WX=y
258253
CONFIG_SCHED_STACK_END_CHECK=y
259254
CONFIG_PANIC_ON_OOPS=y
260255
CONFIG_PANIC_TIMEOUT=-1
@@ -263,6 +258,5 @@ CONFIG_SOFTLOCKUP_DETECTOR=y
263258
CONFIG_WQ_WATCHDOG=y
264259
# CONFIG_SCHED_DEBUG is not set
265260
CONFIG_FUNCTION_TRACER=y
266-
CONFIG_DEBUG_WX=y
267261
CONFIG_DEBUG_USER=y
268262
# CONFIG_RUNTIME_TESTING_MENU is not set

arch/arm/configs/aspeed_g5_defconfig

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CONFIG_KERNEL_XZ=y
33
CONFIG_SYSVIPC=y
44
CONFIG_NO_HZ_IDLE=y
55
CONFIG_HIGH_RES_TIMERS=y
6+
CONFIG_BPF_SYSCALL=y
67
CONFIG_IKCONFIG=y
78
CONFIG_IKCONFIG_PROC=y
89
CONFIG_LOG_BUF_SHIFT=16
@@ -14,12 +15,11 @@ CONFIG_BLK_DEV_INITRD=y
1415
# CONFIG_UID16 is not set
1516
# CONFIG_SYSFS_SYSCALL is not set
1617
# CONFIG_AIO is not set
17-
CONFIG_BPF_SYSCALL=y
1818
CONFIG_EMBEDDED=y
1919
CONFIG_PERF_EVENTS=y
2020
# CONFIG_COMPAT_BRK is not set
21-
CONFIG_SLAB=y
2221
CONFIG_SLAB_FREELIST_RANDOM=y
22+
CONFIG_SLAB_FREELIST_HARDENED=y
2323
CONFIG_ARCH_MULTI_V6=y
2424
CONFIG_ARCH_ASPEED=y
2525
CONFIG_MACH_ASPEED_G5=y
@@ -31,10 +31,7 @@ CONFIG_VMSPLIT_2G=y
3131
CONFIG_NR_CPUS=2
3232
CONFIG_HIGHMEM=y
3333
CONFIG_UACCESS_WITH_MEMCPY=y
34-
CONFIG_SECCOMP=y
3534
# CONFIG_ATAGS is not set
36-
CONFIG_ZBOOT_ROM_TEXT=0x0
37-
CONFIG_ZBOOT_ROM_BSS=0x0
3835
CONFIG_KEXEC=y
3936
CONFIG_VFP=y
4037
CONFIG_NEON=y
@@ -89,7 +86,6 @@ CONFIG_NETCONSOLE=y
8986
# CONFIG_NET_VENDOR_AMAZON is not set
9087
# CONFIG_NET_VENDOR_AQUANTIA is not set
9188
# CONFIG_NET_VENDOR_ARC is not set
92-
# CONFIG_NET_VENDOR_AURORA is not set
9389
# CONFIG_NET_VENDOR_BROADCOM is not set
9490
# CONFIG_NET_VENDOR_CADENCE is not set
9591
# CONFIG_NET_VENDOR_CAVIUM is not set
@@ -130,7 +126,7 @@ CONFIG_KEYBOARD_GPIO_POLLED=y
130126
# CONFIG_INPUT_MOUSE is not set
131127
CONFIG_INPUT_MISC=y
132128
CONFIG_INPUT_IBM_PANEL=y
133-
# CONFIG_SERIO is not set
129+
CONFIG_SERIO_RAW=y
134130
# CONFIG_VT is not set
135131
# CONFIG_LEGACY_PTYS is not set
136132
CONFIG_SERIAL_8250=y
@@ -144,11 +140,11 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
144140
CONFIG_SERIAL_8250_DW=y
145141
CONFIG_SERIAL_OF_PLATFORM=y
146142
CONFIG_ASPEED_KCS_IPMI_BMC=y
143+
CONFIG_IPMI_KCS_BMC_SERIO=y
147144
CONFIG_ASPEED_BT_IPMI_BMC=y
148145
CONFIG_HW_RANDOM_TIMERIOMEM=y
149146
# CONFIG_I2C_COMPAT is not set
150147
CONFIG_I2C_CHARDEV=y
151-
CONFIG_I2C_MUX=y
152148
CONFIG_I2C_MUX_GPIO=y
153149
CONFIG_I2C_MUX_PCA9541=y
154150
CONFIG_I2C_MUX_PCA954x=y
@@ -231,9 +227,6 @@ CONFIG_RTC_DRV_RV8803=y
231227
CONFIG_RTC_DRV_ASPEED=y
232228
# CONFIG_VIRTIO_MENU is not set
233229
# CONFIG_IOMMU_SUPPORT is not set
234-
CONFIG_ASPEED_LPC_CTRL=y
235-
CONFIG_ASPEED_LPC_SNOOP=y
236-
CONFIG_ASPEED_P2A_CTRL=y
237230
CONFIG_IIO=y
238231
CONFIG_ASPEED_ADC=y
239232
CONFIG_MAX1363=y
@@ -278,14 +271,14 @@ CONFIG_DEBUG_INFO_DWARF4=y
278271
CONFIG_GDB_SCRIPTS=y
279272
CONFIG_STRIP_ASM_SYMS=y
280273
CONFIG_DEBUG_FS=y
274+
CONFIG_DEBUG_WX=y
275+
CONFIG_SCHED_STACK_END_CHECK=y
276+
CONFIG_PANIC_ON_OOPS=y
277+
CONFIG_PANIC_TIMEOUT=-1
281278
CONFIG_SOFTLOCKUP_DETECTOR=y
282279
# CONFIG_DETECT_HUNG_TASK is not set
283280
CONFIG_WQ_WATCHDOG=y
284-
CONFIG_PANIC_ON_OOPS=y
285-
CONFIG_PANIC_TIMEOUT=-1
286281
# CONFIG_SCHED_DEBUG is not set
287-
CONFIG_SCHED_STACK_END_CHECK=y
288282
CONFIG_FUNCTION_TRACER=y
289-
# CONFIG_RUNTIME_TESTING_MENU is not set
290-
CONFIG_DEBUG_WX=y
291283
CONFIG_DEBUG_USER=y
284+
# CONFIG_RUNTIME_TESTING_MENU is not set

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ CONFIG_VFP=y
5353
CONFIG_NEON=y
5454
CONFIG_PM_DEBUG=y
5555
CONFIG_PM_TEST_SUSPEND=y
56+
CONFIG_KPROBES=y
5657
CONFIG_MODULES=y
5758
CONFIG_MODULE_UNLOAD=y
5859
CONFIG_MODVERSIONS=y
@@ -119,7 +120,6 @@ CONFIG_BLK_DEV_SD=y
119120
CONFIG_SCSI_CONSTANTS=y
120121
CONFIG_SCSI_LOGGING=y
121122
CONFIG_SCSI_SCAN_ASYNC=y
122-
# CONFIG_SCSI_LOWLEVEL is not set
123123
CONFIG_ATA=y
124124
CONFIG_SATA_AHCI_PLATFORM=y
125125
CONFIG_AHCI_IMX=y
@@ -252,6 +252,7 @@ CONFIG_REGULATOR_DA9052=y
252252
CONFIG_REGULATOR_DA9062=y
253253
CONFIG_REGULATOR_DA9063=y
254254
CONFIG_REGULATOR_GPIO=y
255+
CONFIG_REGULATOR_LTC3676=y
255256
CONFIG_REGULATOR_MC13783=y
256257
CONFIG_REGULATOR_MC13892=y
257258
CONFIG_REGULATOR_PFUZE100=y

arch/arm/configs/multi_v7_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ CONFIG_ARCH_AT91=y
1616
CONFIG_SOC_SAMA5D2=y
1717
CONFIG_SOC_SAMA5D3=y
1818
CONFIG_SOC_SAMA5D4=y
19+
CONFIG_SOC_SAMA7G5=y
1920
CONFIG_ARCH_BCM=y
2021
CONFIG_ARCH_BCM_CYGNUS=y
2122
CONFIG_ARCH_BCM_HR2=y
@@ -215,6 +216,7 @@ CONFIG_MTD_NAND_GPMI_NAND=y
215216
CONFIG_MTD_NAND_VF610_NFC=y
216217
CONFIG_MTD_NAND_DAVINCI=y
217218
CONFIG_MTD_NAND_STM32_FMC2=y
219+
CONFIG_MTD_NAND_PL35X=y
218220
CONFIG_MTD_SPI_NOR=y
219221
CONFIG_SPI_ASPEED_SMC=m
220222
CONFIG_MTD_UBI=y
@@ -492,6 +494,7 @@ CONFIG_BATTERY_ACT8945A=y
492494
CONFIG_BATTERY_CPCAP=m
493495
CONFIG_BATTERY_SBS=y
494496
CONFIG_BATTERY_BQ27XXX=m
497+
CONFIG_BATTERY_ACER_A500=m
495498
CONFIG_AXP20X_POWER=m
496499
CONFIG_BATTERY_MAX17040=m
497500
CONFIG_BATTERY_MAX17042=m
@@ -523,6 +526,7 @@ CONFIG_BRCMSTB_THERMAL=m
523526
CONFIG_GENERIC_ADC_THERMAL=m
524527
CONFIG_ST_THERMAL_MEMMAP=y
525528
CONFIG_TEGRA_SOCTHERM=m
529+
CONFIG_TEGRA30_TSENSOR=m
526530
CONFIG_UNIPHIER_THERMAL=y
527531
CONFIG_DA9063_WATCHDOG=m
528532
CONFIG_XILINX_WATCHDOG=y
@@ -550,6 +554,7 @@ CONFIG_BCM7038_WDT=m
550554
CONFIG_BCMA_HOST_SOC=y
551555
CONFIG_BCMA_DRIVER_GMAC_CMN=y
552556
CONFIG_BCMA_DRIVER_GPIO=y
557+
CONFIG_MFD_ACER_A500_EC=m
553558
CONFIG_MFD_ACT8945A=y
554559
CONFIG_MFD_AS3711=y
555560
CONFIG_MFD_AS3722=y
@@ -870,6 +875,7 @@ CONFIG_MMC_SDHCI_PXAV2=m
870875
CONFIG_MMC_SDHCI_SPEAR=y
871876
CONFIG_MMC_SDHCI_S3C_DMA=y
872877
CONFIG_MMC_SDHCI_BCM_KONA=y
878+
CONFIG_MMC_MESON_MX_SDHC=y
873879
CONFIG_MMC_MESON_MX_SDIO=y
874880
CONFIG_MMC_SDHCI_ST=y
875881
CONFIG_MMC_OMAP=y
@@ -895,6 +901,7 @@ CONFIG_LEDS_GPIO=y
895901
CONFIG_LEDS_PWM=y
896902
CONFIG_LEDS_MAX77693=m
897903
CONFIG_LEDS_MAX8997=m
904+
CONFIG_LEDS_ACER_A500=m
898905
CONFIG_LEDS_TRIGGERS=y
899906
CONFIG_LEDS_TRIGGER_TIMER=y
900907
CONFIG_LEDS_TRIGGER_ONESHOT=y
@@ -996,6 +1003,7 @@ CONFIG_APQ_MMCC_8084=y
9961003
CONFIG_MSM_GCC_8660=y
9971004
CONFIG_MSM_MMCC_8960=y
9981005
CONFIG_MSM_MMCC_8974=y
1006+
CONFIG_MICROCHIP_PIT64B=y
9991007
CONFIG_BCM2835_MBOX=y
10001008
CONFIG_ROCKCHIP_IOMMU=y
10011009
CONFIG_TEGRA_IOMMU_GART=y

0 commit comments

Comments
 (0)