diff --git a/arch/arm/configs/vexpress_gem5_defconfig b/arch/arm/configs/vexpress_gem5_defconfig
index 48ef24a..cc61fee 100644
--- a/arch/arm/configs/vexpress_gem5_defconfig
+++ b/arch/arm/configs/vexpress_gem5_defconfig
@@ -30,6 +30,7 @@
 CONFIG_ARCH_VEXPRESS_GEM5=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SMP=y
+CONFIG_NR_CPUS=8
 CONFIG_SCHED_MC=y
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_MCPM=y
@@ -40,6 +41,7 @@
 CONFIG_PREEMPT_COUNT=y
 CONFIG_SCHED_HRTICK=y
 CONFIG_AEABI=y
+CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=""
@@ -179,7 +181,7 @@
 CONFIG_NLS_ISO8859_1=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -189,6 +191,9 @@
 CONFIG_TRACING=y
 CONFIG_FTRACE=y
 CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_LL=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_DEBUG_PREEMPT=n
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
 CONFIG_BINARY_PRINTF=y
diff --git a/arch/arm/configs/vexpress_gem5_serverconfig b/arch/arm/configs/vexpress_gem5_server_defconfig
similarity index 99%
rename from arch/arm/configs/vexpress_gem5_serverconfig
rename to arch/arm/configs/vexpress_gem5_server_defconfig
index feef59c..a4c1d05 100644
--- a/arch/arm/configs/vexpress_gem5_serverconfig
+++ b/arch/arm/configs/vexpress_gem5_server_defconfig
@@ -2468,7 +2468,7 @@
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_KERNEL=y
 
 #
 # Memory Debugging
@@ -2540,6 +2540,9 @@
 # CONFIG_STRICT_DEVMEM is not set
 CONFIG_ARM_UNWIND=y
 CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_LL=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_DEBUG_PREEMPT=n
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 # CONFIG_OC_ETM is not set