summaryrefslogtreecommitdiff
path: root/hikey960
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2021-01-13 03:29:47 +0000
committerJohn Stultz <john.stultz@linaro.org>2021-01-26 03:01:06 +0000
commitfb375231fc9fd4571eb6ee9e35b8b12eff9c7acf (patch)
tree230044818aacf4a01dcb8668f60434f1b3a05ea7 /hikey960
parent6d0db311726049ef67f5f21354b87a081ca6b74a (diff)
downloadhikey-fb375231fc9fd4571eb6ee9e35b8b12eff9c7acf.tar.gz
hikey960: Enable Virt-A/B on HiKey960
Following again in Amit's footsteps, this implements virtual A/B in the same fashion as Amit's patch for db845c: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1547736 As the bootloader doesn't support the slot_suffix, we fix it to _a statically in the boot args. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I80079d8eeb2635fece1f0f5f24eeaeff3a1c53db
Diffstat (limited to 'hikey960')
-rw-r--r--hikey960/BoardConfig.mk2
-rw-r--r--hikey960/device-hikey960.mk10
2 files changed, 11 insertions, 1 deletions
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