diff options
| author | John Stultz <john.stultz@linaro.org> | 2021-01-26 07:31:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-26 07:31:17 +0000 |
| commit | a4959d9c61dc5ab6125aa6233fd93dca23e654d6 (patch) | |
| tree | a27825bbd785cdb5f9970b610f3c8569739f2ab7 | |
| parent | 2dfc5062079c5e961041c4ed0ac483a40939584f (diff) | |
| parent | ff6455e7af900da0b893ed27defdfd194813fd4b (diff) | |
| download | hikey-a4959d9c61dc5ab6125aa6233fd93dca23e654d6.tar.gz | |
hikey960: Update ptable to use super instead of system label am: ff6455e7af
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1549017
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36f1b0aa57dbe8eb0198ef5f72ff9f219cd9f45c
| -rw-r--r-- | hikey960/BoardConfig.mk | 6 | ||||
| -rwxr-xr-x | installer/hikey960/flash-all.sh | 2 | ||||
| -rw-r--r-- | installer/hikey960/prm_ptable.img | bin | 24576 -> 24576 bytes | |||
| -rwxr-xr-x | installer/hikey960/uefi-flash-all.sh | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk index 0cd99147..d17a5b9d 100644 --- a/hikey960/BoardConfig.mk +++ b/hikey960/BoardConfig.mk @@ -60,10 +60,4 @@ BOARD_SUPER_PARTITION_GROUPS := hikey960_dynamic_partitions 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 dda34d31..2828089a 100755 --- a/installer/hikey960/flash-all.sh +++ b/installer/hikey960/flash-all.sh @@ -24,6 +24,6 @@ fastboot flash fw_lpm3 "${INSTALLER_DIR}"/hisi-lpm3.img 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 Binary files differindex c81ffcfa..e7b9b037 100644 --- a/installer/hikey960/prm_ptable.img +++ b/installer/hikey960/prm_ptable.img diff --git a/installer/hikey960/uefi-flash-all.sh b/installer/hikey960/uefi-flash-all.sh index ce402032..9c7301dc 100755 --- a/installer/hikey960/uefi-flash-all.sh +++ b/installer/hikey960/uefi-flash-all.sh @@ -44,7 +44,7 @@ function flashing_atf_uefi () { 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 } |