Skip to content

Commit c800cef

Browse files
committed
Merge branch 'linux-6.1-trunk/at91/config' into linux-6.1-mchp
2 parents f6dfef0 + 6dd3715 commit c800cef

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ CONFIG_MODULE_UNLOAD=y
3333
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
3434
# CONFIG_SWAP is not set
3535
CONFIG_SLAB=y
36+
CONFIG_CMA=y
37+
CONFIG_CMA_DEBUGFS=y
3638
CONFIG_NET=y
3739
CONFIG_PACKET=y
3840
CONFIG_UNIX=y
@@ -296,6 +298,8 @@ CONFIG_CRYPTO_DEV_ATMEL_AES=y
296298
CONFIG_CRYPTO_DEV_ATMEL_TDES=y
297299
CONFIG_CRYPTO_DEV_ATMEL_SHA=y
298300
CONFIG_CRC_CCITT=y
301+
CONFIG_DMA_CMA=y
302+
CONFIG_CMA_SIZE_MBYTES=0
299303
CONFIG_STRIP_ASM_SYMS=y
300304
CONFIG_DEBUG_FS=y
301305
# CONFIG_SCHED_DEBUG is not set

0 commit comments

Comments
 (0)