diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index c717ec7..ca70e59 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -32,6 +32,24 @@
 TARGET_NO_KERNEL := false
 TARGET_NO_RECOVERY := true
 
+# Kernel/boot.img Configuration
+BOARD_KERNEL_BASE        := 0x00000000
+BOARD_KERNEL_PAGESIZE    := 4096
+BOARD_KERNEL_TAGS_OFFSET := 0x00000100
+BOARD_RAMDISK_OFFSET     := 0x01000000
+BOARD_KERNEL_CMDLINE     := console=ttyMSM0,115200n8 earlycon earlyprintk console=tty0 androidboot.console=ttyMSM0
+BOARD_KERNEL_CMDLINE     += androidboot.boot_devices=soc@0/1d84000.ufshc
+BOARD_KERNEL_CMDLINE     += androidboot.hardware=sdm845
+BOARD_KERNEL_CMDLINE     += firmware_class.path=/vendor/firmware/ init=/init printk.devkmsg=on
+BOARD_KERNEL_CMDLINE     += deferred_probe_timeout=30
+
+# Image Configuration
+BOARD_FLASH_BLOCK_SIZE := 262144
+BOARD_BOOTIMAGE_PARTITION_SIZE     := 67108864 #64M
+BOARD_SYSTEMIMAGE_PARTITION_SIZE   := 2998927360
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 57453555712
+BOARD_VENDORIMAGE_PARTITION_SIZE   := 536870912
+
 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
diff --git a/beryllium/BoardConfig.mk b/beryllium/BoardConfig.mk
index b40f9b4..d7da231 100644
--- a/beryllium/BoardConfig.mk
+++ b/beryllium/BoardConfig.mk
@@ -4,21 +4,3 @@
 # Board Information
 TARGET_BOOTLOADER_BOARD_NAME := beryllium
 TARGET_BOARD_PLATFORM := beryllium
-
-# Kernel/boot.img Configuration
-BOARD_KERNEL_BASE        := 0x00000000
-BOARD_KERNEL_PAGESIZE    := 4096
-BOARD_KERNEL_TAGS_OFFSET := 0x00000100
-BOARD_RAMDISK_OFFSET     := 0x01000000
-BOARD_KERNEL_CMDLINE     := console=ttyMSM0,115200n8 androidboot.console=ttyMSM0
-BOARD_KERNEL_CMDLINE     += androidboot.hardware=beryllium androidboot.boot_devices=soc@0/1d84000.ufshc
-BOARD_KERNEL_CMDLINE     += firmware_class.path=/vendor/firmware/ init=/init printk.devkmsg=on
-BOARD_KERNEL_CMDLINE     += deferred_probe_timeout=30
-BOARD_KERNEL_CMDLINE     += fw_devlink=permissive
- 
-# Image Configuration
-BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 #64M
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 57453555712
-BOARD_VENDORIMAGE_PARTITION_SIZE := 536870912
-BOARD_FLASH_BLOCK_SIZE := 262144
diff --git a/enchilada/BoardConfig.mk b/enchilada/BoardConfig.mk
index a837dab..2f2d327 100644
--- a/enchilada/BoardConfig.mk
+++ b/enchilada/BoardConfig.mk
@@ -4,21 +4,3 @@
 # Board Information
 TARGET_BOOTLOADER_BOARD_NAME := enchilada
 TARGET_BOARD_PLATFORM := enchilada
-
-# Kernel/boot.img Configuration
-BOARD_KERNEL_BASE        := 0x00000000
-BOARD_KERNEL_PAGESIZE    := 4096
-BOARD_KERNEL_TAGS_OFFSET := 0x00000100
-BOARD_RAMDISK_OFFSET     := 0x01000000
-BOARD_KERNEL_CMDLINE     := earlycon earlyprintk console=ttyMSM0,115200n8 androidboot.console=ttyMSM0
-BOARD_KERNEL_CMDLINE     += androidboot.hardware=enchilada androidboot.boot_devices=soc@0/1d84000.ufshc
-BOARD_KERNEL_CMDLINE     += firmware_class.path=/vendor/firmware/ init=/init printk.devkmsg=on
-BOARD_KERNEL_CMDLINE     += deferred_probe_timeout=30
-BOARD_KERNEL_CMDLINE     += fw_devlink=on selinux=0
-
-# Image Configuration
-BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 #64M
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2998927360
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 118112366592
-BOARD_VENDORIMAGE_PARTITION_SIZE := 536870912
-BOARD_FLASH_BLOCK_SIZE := 262144
diff --git a/sdm845/BoardConfig.mk b/sdm845/BoardConfig.mk
index 822f65f..52bb3d8 100644
--- a/sdm845/BoardConfig.mk
+++ b/sdm845/BoardConfig.mk
@@ -4,20 +4,3 @@
 # Board Information
 TARGET_BOOTLOADER_BOARD_NAME := sdm845
 #TARGET_BOARD_PLATFORM := sdm845
-
-# Kernel/boot.img Configuration
-BOARD_KERNEL_BASE        := 0x00000000
-BOARD_KERNEL_PAGESIZE    := 4096
-BOARD_KERNEL_TAGS_OFFSET := 0x00000100
-BOARD_RAMDISK_OFFSET     := 0x01000000
-BOARD_KERNEL_CMDLINE     := console=ttyMSM0,115200n8 earlycon earlyprintk console=tty0 androidboot.console=ttyMSM0
-BOARD_KERNEL_CMDLINE     += androidboot.hardware=sdm845 androidboot.boot_devices=soc@0/1d84000.ufshc
-BOARD_KERNEL_CMDLINE     += firmware_class.path=/vendor/firmware/ init=/init printk.devkmsg=on
-BOARD_KERNEL_CMDLINE     += deferred_probe_timeout=30
-
-# Image Configuration
-BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 #64M
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2998927360
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 57453555712
-BOARD_VENDORIMAGE_PARTITION_SIZE := 536870912
-BOARD_FLASH_BLOCK_SIZE := 262144