Skip to content

Commit c036b52

Browse files
committed
Merge tag 'at91-defconfig-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/defconfig
Microchip AT91 defconfig updates for v6.14 This update includes: - support for the SAMA7D65 SoC * tag 'at91-defconfig-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: configs: at91: sama7: add new SoC config Link: https://lore.kernel.org/r/20250107081424.758980-1-claudiu.beznea@tuxon.dev Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f16d91d + 221984d commit c036b52

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CONFIG_ARCH_AT91=y
2020
CONFIG_SOC_SAMA5D2=y
2121
CONFIG_SOC_SAMA5D3=y
2222
CONFIG_SOC_SAMA5D4=y
23+
CONFIG_SOC_SAMA7D65=y
2324
CONFIG_SOC_SAMA7G5=y
2425
CONFIG_SOC_LAN966=y
2526
CONFIG_ARCH_BCM=y

arch/arm/configs/sama7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CONFIG_EXPERT=y
1212
# CONFIG_IO_URING is not set
1313
CONFIG_KALLSYMS_ALL=y
1414
CONFIG_ARCH_AT91=y
15+
CONFIG_SOC_SAMA7D65=y
1516
CONFIG_SOC_SAMA7G5=y
1617
CONFIG_ATMEL_CLOCKSOURCE_TCB=y
1718
# CONFIG_CACHE_L2X0 is not set

0 commit comments

Comments
 (0)