diff --git a/build_kernel_image.sh b/build_kernel_image.sh
index a06b1ac..4dad7db 100755
--- a/build_kernel_image.sh
+++ b/build_kernel_image.sh
@@ -203,6 +203,8 @@
 loglevel=7
 init=/sbin/init
 cros_secure
+oops=panic
+panic=-1
 EOF
 
 if [[ "${FLAGS_arch}" = "x86" || "${FLAGS_arch}" = "amd64" ]]; then
@@ -218,8 +220,6 @@
 tpm_tis.force=1
 tpm_tis.interrupts=0
 nmi_watchdog=panic,lapic
-oops=panic
-panic=-1
 EOF
   WORK="${WORK} ${FLAGS_working_dir}/config.txt"