hikey960: Update ptable to use super instead of system label am: ff6455e7af am: a4959d9c61
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1549017
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3e63995fa1b26a942e5f1254e23a85a8e9afebc8
diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk
index 0cd9914..d17a5b9 100644
--- a/hikey960/BoardConfig.mk
+++ b/hikey960/BoardConfig.mk
@@ -60,10 +60,4 @@
BOARD_HIKEY960_DYNAMIC_PARTITIONS_PARTITION_LIST := system vendor system_ext product
BOARD_HIKEY960_DYNAMIC_PARTITIONS_SIZE := 4915724288
-# !!! This HACK needs to be removed !!!
-# Until the ptable is updated, we flash super.img to system
-# but this is deprecated. We need to update the ptable and
-# roll that out. Then this can be removed.
-BOARD_SUPER_PARTITION_METADATA_DEVICE := system
-
TARGET_RECOVERY_FSTAB := device/linaro/hikey/hikey960/fstab.hikey960
diff --git a/installer/hikey960/flash-all.sh b/installer/hikey960/flash-all.sh
index dda34d3..2828089 100755
--- a/installer/hikey960/flash-all.sh
+++ b/installer/hikey960/flash-all.sh
@@ -24,6 +24,6 @@
fastboot flash trustfirmware "${INSTALLER_DIR}"/hisi-bl31.bin
fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img
fastboot flash dts "${ANDROID_PRODUCT_OUT}"/dt.img
-fastboot flash system "${ANDROID_PRODUCT_OUT}"/super.img
+fastboot flash super "${ANDROID_PRODUCT_OUT}"/super.img
fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img
fastboot reboot
diff --git a/installer/hikey960/prm_ptable.img b/installer/hikey960/prm_ptable.img
index c81ffcf..e7b9b03 100644
--- a/installer/hikey960/prm_ptable.img
+++ b/installer/hikey960/prm_ptable.img
Binary files differ
diff --git a/installer/hikey960/uefi-flash-all.sh b/installer/hikey960/uefi-flash-all.sh
index ce40203..9c7301d 100755
--- a/installer/hikey960/uefi-flash-all.sh
+++ b/installer/hikey960/uefi-flash-all.sh
@@ -44,7 +44,7 @@
fastboot flash fip "${INSTALLER_DIR}"/fip.bin
fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img
- fastboot flash system "${ANDROID_PRODUCT_OUT}"/super.img
+ fastboot flash super "${ANDROID_PRODUCT_OUT}"/super.img
fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img
}