diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
index 9b215b0..6cc483e 100644
--- a/kernel/build/config-arm64
+++ b/kernel/build/config-arm64
@@ -432,13 +432,13 @@ CONFIG_ROCKCHIP_ERRATUM_3588001=y
 CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
 # end of ARM errata workarounds via the alternatives framework
 
-# CONFIG_ARM64_4K_PAGES is not set
-CONFIG_ARM64_16K_PAGES=y
+CONFIG_ARM64_4K_PAGES=y
+# CONFIG_ARM64_16K_PAGES is not set
 # CONFIG_ARM64_64K_PAGES is not set
-# CONFIG_ARM64_VA_BITS_39 is not set
-CONFIG_ARM64_VA_BITS_48=y
+CONFIG_ARM64_VA_BITS_39=y
+# CONFIG_ARM64_VA_BITS_48 is not et
 # CONFIG_ARM64_VA_BITS_52 is not set
-CONFIG_ARM64_VA_BITS=48
+CONFIG_ARM64_VA_BITS=39
 CONFIG_ARM64_PA_BITS_48=y
 CONFIG_ARM64_PA_BITS=48
 # CONFIG_CPU_BIG_ENDIAN is not set
@@ -834,10 +834,10 @@ CONFIG_ARCH_WANTS_EXECMEM_LATE=y
 CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=18
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
+# CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+# CONFIG_ARCH_MMAP_RND_BITS is not set
+# CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+# CONFIG_ARCH_MMAP_RND_COMPAT_BITS is not set
 CONFIG_HAVE_PAGE_SIZE_4KB=y
 CONFIG_PAGE_SIZE_4KB=y
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
@@ -3735,7 +3735,7 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y
 # CONFIG_SERIAL_OWL is not set
-# CONFIG_SERIAL_RPI_FW is not set
+CONFIG_SERIAL_RPI_FW=m
 # end of Serial drivers
 
 CONFIG_SERIAL_MCTRL_GPIO=y