diff options
| author | John Stultz <john.stultz@linaro.org> | 2021-01-27 07:59:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-27 07:59:42 +0000 |
| commit | 023ebe41d4660f9a82ef3479857c0ac9eeedfd0d (patch) | |
| tree | 230044818aacf4a01dcb8668f60434f1b3a05ea7 | |
| parent | e5d46d81be1ec76d9fd9b49e289d4a7eacb66448 (diff) | |
| parent | e99d1866b94650104889da97b1e9c395b97f200f (diff) | |
| download | hikey-023ebe41d4660f9a82ef3479857c0ac9eeedfd0d.tar.gz | |
hikey960: Enable Virt-A/B on HiKey960 am: fb375231fc am: 2dfc506207 am: e99d1866b9
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1549236
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I554795ed4d5fb2dd59c9c0fe93d3b64d1bdaeb58
| -rw-r--r-- | fstab.ramdisk960 | 8 | ||||
| -rw-r--r-- | hikey960/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | hikey960/device-hikey960.mk | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/fstab.ramdisk960 b/fstab.ramdisk960 index 61928815..098386d5 100644 --- a/fstab.ramdisk960 +++ b/fstab.ramdisk960 @@ -1,4 +1,4 @@ -system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount -vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount -system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount -product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount +system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect +vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect +system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect +product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk index 789b18f4..0cd99147 100644 --- a/hikey960/BoardConfig.mk +++ b/hikey960/BoardConfig.mk @@ -10,7 +10,7 @@ TARGET_NO_DTIMAGE := false BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey960 firmware_class.path=/vendor/firmware efi=noruntime init=/init BOARD_KERNEL_CMDLINE += androidboot.boot_devices=soc/ff3b0000.ufs -BOARD_KERNEL_CMDLINE += loglevel=15 +BOARD_KERNEL_CMDLINE += loglevel=15 androidboot.slot_suffix=_a ifeq ($(TARGET_BUILTIN_EDID), true) BOARD_KERNEL_CMDLINE += drm_kms_helper.edid_firmware=edid/1920x1080.bin diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index f1946eef..d9010354 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -14,6 +14,16 @@ # limitations under the License. # +# Enable Virtual A/B +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS += \ + product \ + system \ + system_ext \ + vendor + +$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) + PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ $(TARGET_PREBUILT_DTB):hi3660-hikey960.dtb |