Skip to content

Commit 5bad490

Browse files
committed
Merge tag 'soc-defconfig-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC defconfig updates from Arnd Bergmann: "As usual, the arm32 and arm64 defconfig files get changed to account for added device drivers that can now be used. The files are also refreshed to reflect the more recent Kconfig changes that are going into v6.8" * tag 'soc-defconfig-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (30 commits) ARM: defconfig: remove dead platform options ARM: defconfig: remove CONFIG_SLUB references ARM: defconfig: remove CONFIG_NET_ETHERNET references ARM: defconfig: remove sysfs-deprecated entries ARM: defconfig: reorder config lines arm64: defconfig reorder config lines ARM: multi_v7_defconfig: Enable STM32 IPCC mailbox driver arm64: defconfig: Enable Qualcomm SC8280XP camera clock controller ARM: multi_v7_defconfig: Enable RPMSG CHAR and CTRL ARM: multi_v7_defconfig: enable STM32 DCMIPP media support arm64: defconfig: enable GPU clock controller for SM8[45]50 arm64: defconfig: Enable X1E80100 SoC base configs arm64: defconfig: enable Qualcomm WSA884x driver arm64: defconfig: enable Qualcomm UEFI Secure App driver arm64: defconfig: enable Qualcomm sc8280xp sound drivers arm64: defconfig: enable clock controller and pinctrl arm64: defconfig: Enable DRM_POWERVR arm64: defconfig: Enable configs for MT8195-Cherry-Tomato Chromebook arm64: defconfig: Enable DA9211 regulator arm64: deconfig: enable Qualcomm SM8650 SoC drivers ...
2 parents fb249b2 + c2dba4d commit 5bad490

43 files changed

Lines changed: 160 additions & 155 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

arch/arm/configs/am200epdkit_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
CONFIG_LOCALVERSION="gum"
22
CONFIG_SYSVIPC=y
3-
CONFIG_SYSFS_DEPRECATED_V2=y
43
CONFIG_PREEMPT=y
54
CONFIG_EXPERT=y
65
# CONFIG_EPOLL is not set
@@ -49,7 +48,6 @@ CONFIG_BLK_DEV_SD=m
4948
CONFIG_ATA=m
5049
CONFIG_PATA_PCMCIA=m
5150
CONFIG_NETDEVICES=y
52-
CONFIG_NET_ETHERNET=y
5351
CONFIG_SMC91X=m
5452
# CONFIG_LEGACY_PTYS is not set
5553
CONFIG_SERIAL_PXA=y

arch/arm/configs/aspeed_g4_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ CONFIG_BLK_DEV_INITRD=y
1212
# CONFIG_RD_BZIP2 is not set
1313
# CONFIG_RD_LZO is not set
1414
# CONFIG_RD_LZ4 is not set
15+
CONFIG_EXPERT=y
1516
# CONFIG_UID16 is not set
1617
# CONFIG_SYSFS_SYSCALL is not set
1718
# CONFIG_AIO is not set
18-
CONFIG_EXPERT=y
1919
CONFIG_PERF_EVENTS=y
20+
CONFIG_KEXEC=y
2021
# CONFIG_ARCH_MULTI_V7 is not set
2122
CONFIG_ARCH_ASPEED=y
2223
CONFIG_MACH_ASPEED_G4=y
2324
CONFIG_VMSPLIT_2G=y
2425
CONFIG_AEABI=y
2526
CONFIG_UACCESS_WITH_MEMCPY=y
2627
# CONFIG_ATAGS is not set
27-
CONFIG_KEXEC=y
2828
CONFIG_JUMP_LABEL=y
2929
CONFIG_STRICT_KERNEL_RWX=y
3030
# CONFIG_BLK_DEBUG_FS is not set

arch/arm/configs/aspeed_g5_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ CONFIG_BLK_DEV_INITRD=y
1212
# CONFIG_RD_BZIP2 is not set
1313
# CONFIG_RD_LZO is not set
1414
# CONFIG_RD_LZ4 is not set
15+
CONFIG_EXPERT=y
1516
# CONFIG_UID16 is not set
1617
# CONFIG_SYSFS_SYSCALL is not set
1718
# CONFIG_AIO is not set
18-
CONFIG_EXPERT=y
1919
CONFIG_PERF_EVENTS=y
20+
CONFIG_KEXEC=y
2021
CONFIG_ARCH_MULTI_V6=y
2122
CONFIG_ARCH_ASPEED=y
2223
CONFIG_MACH_ASPEED_G5=y
@@ -29,7 +30,6 @@ CONFIG_NR_CPUS=2
2930
CONFIG_HIGHMEM=y
3031
CONFIG_UACCESS_WITH_MEMCPY=y
3132
# CONFIG_ATAGS is not set
32-
CONFIG_KEXEC=y
3333
CONFIG_VFP=y
3434
CONFIG_NEON=y
3535
CONFIG_KERNEL_MODE_NEON=y

arch/arm/configs/assabet_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ CONFIG_MTD_SA1100=y
2828
CONFIG_BLK_DEV_LOOP=m
2929
CONFIG_BLK_DEV_RAM=y
3030
CONFIG_NETDEVICES=y
31-
CONFIG_NET_ETHERNET=y
3231
CONFIG_NET_PCMCIA=y
3332
CONFIG_PCMCIA_PCNET=y
3433
CONFIG_INPUT_EVDEV=y

arch/arm/configs/at91_dt_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ CONFIG_LOG_BUF_SHIFT=14
66
CONFIG_CGROUPS=y
77
CONFIG_BLK_DEV_INITRD=y
88
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
9-
CONFIG_KALLSYMS_ALL=y
109
CONFIG_EXPERT=y
10+
CONFIG_KALLSYMS_ALL=y
11+
CONFIG_KEXEC=y
1112
CONFIG_ARCH_MULTI_V4T=y
1213
CONFIG_ARCH_MULTI_V5=y
1314
# CONFIG_ARCH_MULTI_V7 is not set
@@ -22,7 +23,6 @@ CONFIG_UACCESS_WITH_MEMCPY=y
2223
CONFIG_ARM_APPENDED_DTB=y
2324
CONFIG_ARM_ATAG_DTB_COMPAT=y
2425
CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
25-
CONFIG_KEXEC=y
2626
CONFIG_MODULES=y
2727
CONFIG_MODULE_UNLOAD=y
2828
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

arch/arm/configs/bcm2835_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ CONFIG_SCHED_AUTOGROUP=y
1818
CONFIG_RELAY=y
1919
CONFIG_BLK_DEV_INITRD=y
2020
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
21-
CONFIG_KALLSYMS_ALL=y
2221
CONFIG_EXPERT=y
22+
CONFIG_KALLSYMS_ALL=y
2323
CONFIG_PROFILING=y
2424
CONFIG_CC_STACKPROTECTOR_REGULAR=y
25+
CONFIG_CRASH_DUMP=y
2526
CONFIG_ARCH_MULTI_V6=y
2627
CONFIG_ARCH_BCM=y
2728
CONFIG_ARCH_BCM2835=y
2829
CONFIG_AEABI=y
2930
CONFIG_SECCOMP=y
3031
CONFIG_KEXEC=y
31-
CONFIG_CRASH_DUMP=y
3232
CONFIG_CPU_FREQ=y
3333
CONFIG_CPU_FREQ_STAT=y
3434
CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y

arch/arm/configs/clps711x_defconfig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,8 @@ CONFIG_RD_LZMA=y
66
CONFIG_EXPERT=y
77
CONFIG_JUMP_LABEL=y
88
CONFIG_PARTITION_ADVANCED=y
9-
CONFIG_ARCH_CLPS711X=y
10-
CONFIG_ARCH_AUTCPU12=y
11-
CONFIG_ARCH_CDB89712=y
12-
CONFIG_ARCH_CLEP7312=y
13-
CONFIG_ARCH_EDB7211=y
14-
CONFIG_ARCH_P720T=y
159
CONFIG_AEABI=y
1610
# CONFIG_COREDUMP is not set
17-
CONFIG_SLUB=y
1811
CONFIG_SLUB_TINY=y
1912
CONFIG_NET=y
2013
CONFIG_PACKET=y

arch/arm/configs/collie_defconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1"
1313
CONFIG_FPE_NWFPE=y
1414
CONFIG_PM=y
1515
# CONFIG_SWAP is not set
16-
CONFIG_SLUB=y
1716
CONFIG_SLUB_TINY=y
1817
CONFIG_NET=y
1918
CONFIG_PACKET=y
@@ -60,9 +59,9 @@ CONFIG_MCP_SA11X0=y
6059
CONFIG_MCP_UCB1200=y
6160
CONFIG_MCP_UCB1200_TS=y
6261
CONFIG_FB=y
63-
CONFIG_FB_MODE_HELPERS=y
6462
CONFIG_FB_SA1100=y
6563
# CONFIG_VGA_CONSOLE is not set
64+
CONFIG_FB_MODE_HELPERS=y
6665
CONFIG_FRAMEBUFFER_CONSOLE=y
6766
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
6867
CONFIG_NEW_LEDS=y

arch/arm/configs/davinci_all_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ CONFIG_DRM_SIMPLE_BRIDGE=m
148148
CONFIG_DRM_TINYDRM=m
149149
CONFIG_TINYDRM_ST7586=m
150150
CONFIG_FB=y
151-
CONFIG_FIRMWARE_EDID=y
152151
CONFIG_FB_DA8XX=y
152+
CONFIG_FIRMWARE_EDID=y
153153
CONFIG_BACKLIGHT_PWM=m
154154
CONFIG_BACKLIGHT_GPIO=m
155155
CONFIG_FRAMEBUFFER_CONSOLE=y

arch/arm/configs/dove_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ CONFIG_EXPERT=y
66
# CONFIG_ARCH_MULTI_V6 is not set
77
CONFIG_ARCH_MULTI_V7=y
88
CONFIG_ARCH_DOVE=y
9-
CONFIG_MACH_DOVE_DB=y
109
CONFIG_MACH_CM_A510=y
11-
CONFIG_MACH_DOVE_DT=y
1210
CONFIG_AEABI=y
1311
CONFIG_HIGHMEM=y
1412
CONFIG_ARM_APPENDED_DTB=y

0 commit comments

Comments
 (0)