From: Tony Ambardar <itugrok@yahoo.com>
Date: Fri, 5 May 2023 00:12:02 +0000 (-0700)
Subject: armvirt: 6.1: update kernel configs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=398226fcdf21768ed51dcbcd50a6cdad17b28a54;p=openwrt%2Fstaging%2Fblogic.git

armvirt: 6.1: update kernel configs

The following new common symbols are defined:

  CONFIG_ARCH_FORCE_MAX_ORDER=11
  # CONFIG_NET_9P_FD is not set

Removed symbols for armvirt/32 include:

  CONFIG_ARM_CRYPTO=y

New symbols for armvirt/64 include:

  CONFIG_ARM64_SME=y
  CONFIG_CRYPTO_POLYVAL_ARM64_CE=y
  # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
  # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
---

diff --git a/target/linux/armvirt/32/config-6.1 b/target/linux/armvirt/32/config-6.1
index 91a0c61ddd49..931607aade71 100644
--- a/target/linux/armvirt/32/config-6.1
+++ b/target/linux/armvirt/32/config-6.1
@@ -11,7 +11,6 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_VIRT=y
 CONFIG_ARM=y
 CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_HEAVY_MB=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
diff --git a/target/linux/armvirt/64/config-6.1 b/target/linux/armvirt/64/config-6.1
index eb5405eb1ef9..5ef4c5d7ff12 100644
--- a/target/linux/armvirt/64/config-6.1
+++ b/target/linux/armvirt/64/config-6.1
@@ -29,6 +29,7 @@ CONFIG_ARM64_PA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y
 CONFIG_ARM64_PTR_AUTH=y
 CONFIG_ARM64_PTR_AUTH_KERNEL=y
+CONFIG_ARM64_SME=y
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_ARM64_VA_BITS=39
@@ -65,12 +66,15 @@ CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
+CONFIG_CRYPTO_POLYVAL_ARM64_CE=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64=y
 CONFIG_CRYPTO_SIMD=y
+# CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
+# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DRM=y
diff --git a/target/linux/armvirt/config-6.1 b/target/linux/armvirt/config-6.1
index 36f7d9f01e30..04da68ea1bda 100644
--- a/target/linux/armvirt/config-6.1
+++ b/target/linux/armvirt/config-6.1
@@ -2,6 +2,7 @@ CONFIG_9P_FS=y
 # CONFIG_9P_FS_POSIX_ACL is not set
 # CONFIG_9P_FS_SECURITY is not set
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_ARCH_FORCE_MAX_ORDER=11
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -91,6 +92,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NET_9P=y
 # CONFIG_NET_9P_DEBUG is not set
+# CONFIG_NET_9P_FD is not set
 CONFIG_NET_9P_VIRTIO=y
 CONFIG_NET_FAILOVER=y
 CONFIG_NET_FLOW_LIMIT=y