hikey960: Update ptable to use super instead of system label
This updates the ptable to use the super label instead of system
to avoid using more fragile retrofit options in the build.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Ic57287d7cfd2d6bfa54f3a848d07dc1b858a3810
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
}