diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-01-15 17:02:12 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-01-15 17:02:13 +0300 |
| commit | c036b5230248ab1c79d8e0a40720f17a36dd904c (patch) | |
| tree | c65add338eb7cd6be2acd44d57fd083fcd720fce | |
| parent | f16d91d8febfab45a89007d8af4d81692db7845f (diff) | |
| parent | 221984deceee75846b8a132974683d33dab5a029 (diff) | |
| download | linux-c036b5230248ab1c79d8e0a40720f17a36dd904c.tar.xz | |
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>
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/sama7_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 758276027dbc..b1dcec1a6df5 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH_AT91=y CONFIG_SOC_SAMA5D2=y CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y +CONFIG_SOC_SAMA7D65=y CONFIG_SOC_SAMA7G5=y CONFIG_SOC_LAN966=y CONFIG_ARCH_BCM=y diff --git a/arch/arm/configs/sama7_defconfig b/arch/arm/configs/sama7_defconfig index 1a2e93c8ee71..ea7ddf640ba7 100644 --- a/arch/arm/configs/sama7_defconfig +++ b/arch/arm/configs/sama7_defconfig @@ -12,6 +12,7 @@ CONFIG_EXPERT=y # CONFIG_IO_URING is not set CONFIG_KALLSYMS_ALL=y CONFIG_ARCH_AT91=y +CONFIG_SOC_SAMA7D65=y CONFIG_SOC_SAMA7G5=y CONFIG_ATMEL_CLOCKSOURCE_TCB=y # CONFIG_CACHE_L2X0 is not set |