summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-13 21:53:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-13 21:53:38 +0000
commitb4af0cf2780fc7e97d252f9e6be00494459e9a9f (patch)
tree8aef413704b79182ca13119b5ef4b310bea36706
parent3e5b52701586eaa4f47ba2cbbdefd57e1e2ea6fd (diff)
parent22c4f11d8788c1dc678829574b2063ef39b0653c (diff)
downloadbeagle-x15-b4af0cf2780fc7e97d252f9e6be00494459e9a9f.tar.gz
Enable A/B am: 0dd976e6a6 am: 052f932b96 am: 22c4f11d87
Change-Id: If2a9c1a3b6a30269cd5732821511aafafb86b242
-rw-r--r--BoardConfig.mk16
-rw-r--r--device.mk10
-rw-r--r--fstab.beagle_x15board_v41
-rw-r--r--fstab.beagle_x15board_v51
4 files changed, 28 insertions, 0 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5904014..af7c3a2 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -53,7 +53,11 @@ 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
@@ -95,3 +99,15 @@ BOARD_AVB_ENABLE := true
BOARD_INCLUDE_DTB_IN_BOOTIMG := true
BOARD_PREBUILT_DTBIMAGE_DIR := $(DTB_DIR)
BOARD_MKBOOTIMG_ARGS := --header_version 2
+
+# Board uses A/B OTA.
+AB_OTA_UPDATER := true
+# A/B updater updatable partitions list. Keep in sync with the partition list
+# with "_a" and "_b" variants in the device. Note that the vendor can add more
+# partitions to this list for the bootloader and radio.
+AB_OTA_PARTITIONS += \
+ boot \
+ system \
+ vbmeta \
+ dtbo \
+ vendor
diff --git a/device.mk b/device.mk
index 6e56ea4..b473121 100644
--- a/device.mk
+++ b/device.mk
@@ -178,3 +178,13 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES_DEBUG += \
bootctl \
fastbootd \
+# A/B
+PRODUCT_PACKAGES += \
+ update_engine \
+ update_verifier
+
+PRODUCT_PACKAGES += \
+ update_engine_sideload
+
+PRODUCT_PACKAGES_DEBUG += \
+ update_engine_client
diff --git a/fstab.beagle_x15board_v4 b/fstab.beagle_x15board_v4
index 505e652..5e6549c 100644
--- a/fstab.beagle_x15board_v4
+++ b/fstab.beagle_x15board_v4
@@ -4,6 +4,7 @@
# 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
/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
diff --git a/fstab.beagle_x15board_v5 b/fstab.beagle_x15board_v5
index 8b8ab10..b3dd7d1 100644
--- a/fstab.beagle_x15board_v5
+++ b/fstab.beagle_x15board_v5
@@ -4,6 +4,7 @@
# 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
/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