diff --git a/target/linux/armsr/armv8/config-6.18 b/target/linux/armsr/armv8/config-6.18
index eb62043c104..fdd42b13efc 100644
--- a/target/linux/armsr/armv8/config-6.18
+++ b/target/linux/armsr/armv8/config-6.18
@@ -100,6 +100,7 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_845719=y
+# CONFIG_ARM64_FORCE_52BIT is not set
 CONFIG_ARM64_GCS=y
 CONFIG_ARM64_HAFT=y
 CONFIG_ARM64_HW_AFDBM=y
@@ -116,9 +117,9 @@ CONFIG_ARM64_SME=y
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_ARM64_TLB_RANGE=y
-CONFIG_ARM64_VA_BITS=48
 # CONFIG_ARM64_VA_BITS_39 is not set
-CONFIG_ARM64_VA_BITS_48=y
+# CONFIG_ARM64_VA_BITS_48 is not set
+CONFIG_ARM64_VA_BITS_52=y
 CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
 CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
diff --git a/target/linux/armsr/config-6.18 b/target/linux/armsr/config-6.18
index 5abc5953d6e..cbcfdb38ebb 100644
--- a/target/linux/armsr/config-6.18
+++ b/target/linux/armsr/config-6.18
@@ -62,8 +62,6 @@ CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PA_BITS=48
 CONFIG_ARM64_PA_BITS_48=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
-CONFIG_ARM64_VA_BITS=39
-CONFIG_ARM64_VA_BITS_39=y
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y