diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 76dced9e..6db140d5 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -41,10 +41,11 @@ TARGET_2ND_CPU_VARIANT := generic
 TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53
 endif
 
-BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
-BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
-BOARD_KERNEL_CMDLINE += androidboot.boot_devices=14700000.ufs
 BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
+BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 printk.devkmsg=on
+BOARD_BOOTCONFIG += androidboot.console=ttySAC0
+BOARD_BOOTCONFIG += androidboot.selinux=permissive
+BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false
@@ -357,7 +358,7 @@ BOARD_RAMDISK_USE_LZ4     := true
 #BOARD_KERNEL_PAGESIZE    := 2048
 #BOARD_KERNEL_OFFSET      := 0x80000
 #BOARD_RAMDISK_OFFSET     := 0x4000000
-BOARD_BOOT_HEADER_VERSION := 3
+BOARD_BOOT_HEADER_VERSION := 4
 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
 
 # Enable AVB2.0