diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 6bb49cf..8425667 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -29,8 +29,20 @@ BOARD_USES_QCOM_HARDWARE := true
 TARGET_BOARD_PLATFORM := sdm710
 
 # Kernel
-BOARD_KERNEL_CMDLINE := console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xA90000 androidboot.hardware=qcom androidboot.console=ttyMSM0 msm_rtb.filter=0x237 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 service_locator.enable=1 androidboot.configfs=true androidboot.usbcontroller=a600000.dwc3 swiotlb=1 loop.max_part=7
-BOARD_KERNEL_CMDLINE += kpti=off
+BOARD_KERNEL_CMDLINE := \
+		console=ttyMSM0,115200n8 \
+		earlycon=msm_geni_serial,0xA90000 \
+		androidboot.hardware=qcom \
+		androidboot.console=ttyMSM0 \
+		msm_rtb.filter=0x237 \
+		ehci-hcd.park=3 \
+		lpm_levels.sleep_disabled=1 \
+		service_locator.enable=1 \
+		androidboot.configfs=true \
+		androidboot.usbcontroller=a600000.dwc3 \
+		swiotlb=1 \
+		loop.max_part=7 \
+		kpti=off
 BOARD_KERNEL_BASE := 0x00000000
 BOARD_KERNEL_PAGESIZE := 4096
 BOARD_KERNEL_TAGS_OFFSET := 0x00000100