Enable dynamic partitions am: 1a5f434bc7 am: 8506631901 am: 279ad735dd

Change-Id: I1b3da8864e5988b8ad487f934294b9468413c6cc

4 files changed, 23 insertions, 10 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index af7c3a2..2f03a28 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -41,10 +41,18 @@ BOARD_FLASH_BLOCK_SIZE := 4096
 
 USE_CAMERA_STUB := true
 
-BOARD_BOOTIMAGE_PARTITION_SIZE     := 20971520   # 20 MiB
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 1879048192 # 1792MB
-BOARD_SYSTEMIMAGE_PARTITION_SIZE   := 1073741824 # 1024MB
-BOARD_VENDORIMAGE_PARTITION_SIZE   := 268435456  # 256MB
+BOARD_BOOTIMAGE_PARTITION_SIZE := 20971520 # 20 MiB
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 # 64 MiB
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 961658368 # ~917 MiB
+
+BOARD_SUPER_PARTITION_SIZE := 2684354560 # 2560 MiB
+BOARD_SUPER_PARTITION_GROUPS := group_oem
+# In case when A/B is enabled and we have only one group:
+# size_group = (size_super - 1 MiB) / 2
+BOARD_GROUP_OEM_SIZE := 1341652992 # 1279.5 MiB
+BOARD_GROUP_OEM_PARTITION_LIST := system vendor
+BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
+BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE := true
 
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
@@ -53,11 +61,7 @@ TARGET_BOOTLOADER_BOARD_NAME := beagle_x15board
 TARGET_BOARD_PLATFORM := am57x
 TARGET_COPY_OUT_VENDOR := vendor
 
-TARGET_NO_RECOVERY := true
 TARGET_RECOVERY_FSTAB := device/ti/beagle_x15/$(TARGET_FSTAB)
-BOARD_USES_RECOVERY_AS_BOOT := true
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
-
 TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 TARGET_RECOVERY_UI_LIB := librecovery_ui_beagle_x15
 TARGET_RELEASETOOLS_EXTENSIONS := device/ti/beagle_x15
diff --git a/device.mk b/device.mk
index b473121..b7f1dc1 100644
--- a/device.mk
+++ b/device.mk
@@ -148,6 +148,7 @@ PRODUCT_COPY_FILES += \
 	device/ti/beagle_x15/init.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.rc \
 	device/ti/beagle_x15/init.beagle_x15board.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.beagle_x15board.usb.rc \
 	device/ti/beagle_x15/ueventd.beagle_x15board.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
+	device/ti/beagle_x15/$(TARGET_FSTAB):$(TARGET_COPY_OUT_RAMDISK)/fstab.beagle_x15board \
 	device/ti/beagle_x15/$(TARGET_FSTAB):$(TARGET_COPY_OUT_VENDOR)/etc/fstab.beagle_x15board \
 	frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \
 
@@ -188,3 +189,5 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_PACKAGES_DEBUG += \
 	update_engine_client
+
+PRODUCT_USE_DYNAMIC_PARTITIONS := true
diff --git a/fstab.beagle_x15board_v4 b/fstab.beagle_x15board_v4
index 5e6549c..4b84959 100644
--- a/fstab.beagle_x15board_v4
+++ b/fstab.beagle_x15board_v4
@@ -4,11 +4,14 @@
 # specify 'check', and must come before any filesystems that do specify 'check'
 
 #<src>                                                                  <mnt_point>     <type>  <mnt_flags and options> <fs_mgr_flags>
-/dev/block/platform/44000000.ocp/480b4000.mmc/by-name/system            /               ext4    ro,barrier=1            wait,slotselect
+system                                                                  /system         ext4    ro,barrier=1            wait,slotselect,logical,first_stage_mount
+# Add all non-dynamic partitions except system, after this comment
 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/userdata          /data           ext4    noatime,nosuid,nodev    wait,check,quota
 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/recovery          /recovery       emmc    defaults                defaults
 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/boot              /boot           emmc    defaults                defaults
 /dev/block/platform/44000000.ocp/480b4000.mmc/by-name/misc              /misc           emmc    defaults                defaults
+# Add all dynamic partitions except system, after this comment
+vendor                                                                  /vendor         ext4    ro,barrier=1            wait,slotselect,logical,first_stage_mount
 # USB / SD card
 /devices/platform/44000000.ocp/488c0000.omap_dwc3_2/488d0000.usb*       auto            auto    defaults                voldmanaged=usb0:auto
 /devices/platform/44000000.ocp/48880000.omap_dwc3_1/48890000.usb*       auto            auto    defaults                voldmanaged=usb1:auto
diff --git a/fstab.beagle_x15board_v5 b/fstab.beagle_x15board_v5
index b3dd7d1..90c4bd6 100644
--- a/fstab.beagle_x15board_v5
+++ b/fstab.beagle_x15board_v5
@@ -4,11 +4,14 @@
 # specify 'check', and must come before any filesystems that do specify 'check'
 
 #<src>                                                                                                                                          <mnt_point>     <type>  <mnt_flags and options> <fs_mgr_flags>
-/dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/system       /               ext4    ro,barrier=1            wait,slotselect
+system                                                                                                                                          /system         ext4    ro,barrier=1            wait,slotselect,logical,first_stage_mount
+# Add all non-dynamic partitions except system, after this comment
 /dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/userdata     /data           ext4    noatime,nosuid,nodev    wait,check,quota
 /dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/recovery     /recovery       emmc    defaults                defaults
 /dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/boot         /boot           emmc    defaults                defaults
 /dev/block/platform/44000000.ocp/48000000.interconnect/48000000.interconnect:segment@0/480b4000.target-module/480b4000.mmc/by-name/misc         /misc           emmc    defaults                defaults
+# Add all dynamic partitions except system, after this comment
+vendor                                                                                                                                          /vendor         ext4    ro,barrier=1            wait,slotselect,logical,first_stage_mount
 # USB / SD card
 /devices/platform/48800000.interconnect/48800000.interconnect:segment@0/488c0000.target-module/488c0000.omap_dwc3_2/488d0000.usb*               auto            auto    defaults                voldmanaged=usb0:auto
 /devices/platform/48800000.interconnect/48800000.interconnect:segment@0/48880000.target-module/48880000.omap_dwc3_1/48890000.usb*               auto            auto    defaults                voldmanaged=usb1:auto