From 2a6cab09b940aa3b0176147f74ad5d3c69660a4b Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 3 Oct 2021 00:59:31 +0200 Subject: [PATCH] apm821xx: move CONFIG_DMA* to the generic apm821xx config Both NAND and SATA targets need the DMA engine in one way or another. Due to a kernel config refresh various existing symbols got removed from the apm821xx main config file as well. (That being said, they are still included because the built-in crpyto4xx depends on these.) Signed-off-by: Christian Lamparter --- target/linux/apm821xx/config-5.10 | 29 +++++++---------------- target/linux/apm821xx/nand/config-default | 5 ---- target/linux/apm821xx/sata/config-default | 5 ---- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/target/linux/apm821xx/config-5.10 b/target/linux/apm821xx/config-5.10 index b729bee90364..bb9753d0b4f5 100644 --- a/target/linux/apm821xx/config-5.10 +++ b/target/linux/apm821xx/config-5.10 @@ -1,11 +1,10 @@ # CONFIG_40x is not set CONFIG_44x=y -CONFIG_460EX=y CONFIG_4xx=y CONFIG_4xx_SOC=y # CONFIG_ADVANCED_OPTIONS is not set CONFIG_APM821xx=y -CONFIG_APOLLO3G=y +# CONFIG_APOLLO3G is not set # CONFIG_ARCHES is not set CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y @@ -41,13 +40,8 @@ CONFIG_CPU_BIG_ENDIAN=y CONFIG_CRC16=y # CONFIG_CRC32_SARWATE is not set CONFIG_CRC32_SLICEBY8=y -CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_AEAD=y -CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AUTHENC=y -CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y -CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_DEV_PPC4XX=y CONFIG_CRYPTO_DRBG=y @@ -55,20 +49,14 @@ CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_ESSIV=y -CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_MD5_PPC=y -CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_RNG=y @@ -79,9 +67,14 @@ CONFIG_CRYPTO_SHA1_PPC=y CONFIG_CRYPTO_SHA256=y CONFIG_DATA_SHIFT=12 CONFIG_DEBUG_MISC=y +CONFIG_DMADEVICES=y CONFIG_DMA_DIRECT_REMAP=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y CONFIG_DMA_REMAP=y CONFIG_DTC=y +CONFIG_DW_DMAC=y +CONFIG_DW_DMAC_CORE=y # CONFIG_E200 is not set CONFIG_EARLY_PRINTK=y # CONFIG_EBONY is not set @@ -95,13 +88,6 @@ CONFIG_FREEZER=y # CONFIG_FSL_LBC is not set CONFIG_FW_CACHE=y CONFIG_FW_LOADER_PAGED_BUF=y -CONFIG_GCC_PLUGINS=y -# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set -# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_BUG=y @@ -163,6 +149,7 @@ CONFIG_LZO_DECOMPRESS=y # CONFIG_MATH_EMULATION is not set CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_DEVRES=y CONFIG_MEMFD_CREATE=y CONFIG_MIGRATION=y CONFIG_MMU_GATHER_PAGE_SIZE=y diff --git a/target/linux/apm821xx/nand/config-default b/target/linux/apm821xx/nand/config-default index 060f2abf0692..931290d1b618 100644 --- a/target/linux/apm821xx/nand/config-default +++ b/target/linux/apm821xx/nand/config-default @@ -1,11 +1,6 @@ CONFIG_AT803X_PHY=y CONFIG_AR8216_PHY=y -CONFIG_DMADEVICES=y -CONFIG_DMA_ENGINE=y -CONFIG_DW_DMAC_CORE=y -CONFIG_DW_DMAC=y # CONFIG_SATA_DWC_OLD_DMA is not set -# CONFIG_DW_DMAC_PCI is not set CONFIG_IKAREM=y CONFIG_ATA=y CONFIG_ATA_SFF=y diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default index c3f41c785b99..9a0a8179cce0 100644 --- a/target/linux/apm821xx/sata/config-default +++ b/target/linux/apm821xx/sata/config-default @@ -1,12 +1,7 @@ CONFIG_APOLLO3G=y CONFIG_BROADCOM_PHY=y CONFIG_EXT4_FS=y -CONFIG_DMADEVICES=y -CONFIG_DMA_ENGINE=y -CONFIG_DW_DMAC_CORE=y -CONFIG_DW_DMAC=y # CONFIG_SATA_DWC_OLD_DMA is not set -# CONFIG_DW_DMAC_PCI is not set CONFIG_ATA=y CONFIG_ATA_SFF=y CONFIG_ATA_BMDMA=y -- 2.30.2