diff --git a/BoardConfig.mk b/BoardConfig.mk
index cf2e446..6e5b02d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -59,6 +59,11 @@
     endif
 endif
 
+# Enable console for non-user builds
+ifneq ($(TARGET_BUILD_VARIANT),user)
+    BOARD_KERNEL_CMDLINE += console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xA84000
+endif
+
 # Security patch level
 VENDOR_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)