Skip to content

Commit a9e8c7d

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v6.12-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig
Renesas ARM defconfig updates for v6.12 - Enable support for AK4619 codecs and Renesas R-Car Ethernet-TSN controllers in the ARM64 defconfig, - Enable slab hardening and kmalloc buckets in the Renesas ARM defconfig. * tag 'renesas-arm-defconfig-for-v6.12-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: arm64: defconfig: Enable R-Car Ethernet-TSN support ARM: shmobile: defconfig: Enable slab hardening and kmalloc buckets arm64: defconfig: Enable AK4619 codec support Link: https://lore.kernel.org/r/cover.1724316480.git.geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 636348d + 84542df commit a9e8c7d

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ CONFIG_CPUFREQ_DT=y
2424
CONFIG_VFP=y
2525
CONFIG_NEON=y
2626
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
27+
CONFIG_SLAB_FREELIST_HARDENED=y
2728
CONFIG_CMA=y
2829
CONFIG_NET=y
2930
CONFIG_PACKET=y

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ CONFIG_R8169=m
366366
CONFIG_SH_ETH=y
367367
CONFIG_RAVB=y
368368
CONFIG_RENESAS_ETHER_SWITCH=y
369+
CONFIG_RTSN=y
369370
CONFIG_SMC91X=y
370371
CONFIG_SMSC911X=y
371372
CONFIG_SNI_AVE=y
@@ -1005,6 +1006,7 @@ CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD=m
10051006
CONFIG_SND_SOC_DAVINCI_MCASP=m
10061007
CONFIG_SND_SOC_J721E_EVM=m
10071008
CONFIG_SND_SOC_AK4613=m
1009+
CONFIG_SND_SOC_AK4619=m
10081010
CONFIG_SND_SOC_DA7213=m
10091011
CONFIG_SND_SOC_ES7134=m
10101012
CONFIG_SND_SOC_ES7241=m

0 commit comments

Comments
 (0)