From 910eadf49bee32c1c4265dbeed61cc0c03214406 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Sun, 10 Apr 2022 21:29:08 +0100 Subject: [PATCH] mvebu: refresh the 5.15 kconfigs Clean them up. Signed-off-by: Rui Salvaterra --- target/linux/mvebu/config-5.15 | 8 ++++---- target/linux/mvebu/cortexa53/config-5.15 | 2 -- target/linux/mvebu/cortexa72/config-5.15 | 4 ---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/target/linux/mvebu/config-5.15 b/target/linux/mvebu/config-5.15 index d2a95ce32f..0811ee6d4c 100644 --- a/target/linux/mvebu/config-5.15 +++ b/target/linux/mvebu/config-5.15 @@ -1,4 +1,3 @@ -CONFIG_AF_UNIX_OOB=y CONFIG_AHCI_MVEBU=y CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_32BIT_OFF_T=y @@ -51,7 +50,6 @@ CONFIG_ATA=y CONFIG_ATAGS=y CONFIG_ATA_LEDS=y CONFIG_AUTO_ZRELADDR=y -CONFIG_BINARY_PRINTF=y CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NVME=y @@ -102,6 +100,7 @@ CONFIG_CRC16=y CONFIG_CRYPTO_AES_ARM=y CONFIG_CRYPTO_AES_ARM_BS=y CONFIG_CRYPTO_AUTHENC=y +CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRYPTD=y @@ -229,7 +228,6 @@ CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_LTO_NONE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MACH_ARMADA_370=y @@ -293,7 +291,6 @@ CONFIG_NET_DSA_TAG_DSA_COMMON=y CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_SELFTESTS=y -CONFIG_NET_SOCK_MSG=y CONFIG_NET_SWITCHDEV=y CONFIG_NLS=y CONFIG_NOP_USB_XCEIV=y @@ -427,9 +424,12 @@ CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_WATCHDOG_CORE=y CONFIG_XPS=y +CONFIG_XXHASH=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_BCJ=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZSTD_COMPRESS=y +CONFIG_ZSTD_DECOMPRESS=y diff --git a/target/linux/mvebu/cortexa53/config-5.15 b/target/linux/mvebu/cortexa53/config-5.15 index 8401926376..3c195291d1 100644 --- a/target/linux/mvebu/cortexa53/config-5.15 +++ b/target/linux/mvebu/cortexa53/config-5.15 @@ -14,8 +14,6 @@ CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y CONFIG_ARM64_PAGE_SHIFT=12 CONFIG_ARM64_PA_BITS=48 CONFIG_ARM64_PA_BITS_48=y -# CONFIG_ARM64_PTR_AUTH is not set -# CONFIG_ARM64_SVE is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y CONFIG_ARM64_VA_BITS=39 CONFIG_ARM64_VA_BITS_39=y diff --git a/target/linux/mvebu/cortexa72/config-5.15 b/target/linux/mvebu/cortexa72/config-5.15 index 250c8962a0..7e07c28ba6 100644 --- a/target/linux/mvebu/cortexa72/config-5.15 +++ b/target/linux/mvebu/cortexa72/config-5.15 @@ -15,7 +15,6 @@ CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y CONFIG_ARM64_PAGE_SHIFT=12 CONFIG_ARM64_PA_BITS=48 CONFIG_ARM64_PA_BITS_48=y -# CONFIG_ARM64_PTR_AUTH is not set CONFIG_ARM64_SVE=y # CONFIG_ARM64_TAGGED_ADDR_ABI is not set CONFIG_ARM64_VA_BITS=39 @@ -93,7 +92,4 @@ CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_THREAD_INFO_IN_TASK=y CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_VMAP_STACK=y -CONFIG_XXHASH=y CONFIG_ZONE_DMA32=y -CONFIG_ZSTD_COMPRESS=y -CONFIG_ZSTD_DECOMPRESS=y -- 2.30.2