diff options
| author | vishal <vishal.bhoj@linaro.org> | 2018-09-11 15:18:36 +0530 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2018-09-12 16:34:33 +0000 |
| commit | 7952f1c59a3dde3ca449a01d15ca7b3ab8e90e2d (patch) | |
| tree | df5f97b832a6ea8fa81f764456d837a7ba8a009e | |
| parent | b7d831e198d59af6f65af682f1fbb1c8f25c3dba (diff) | |
| download | hikey-7952f1c59a3dde3ca449a01d15ca7b3ab8e90e2d.tar.gz | |
hikey{,960}: Remove cache partition support
This does not work with latest GSI on AOSP master
which has cache as a symlink to /data/cache where
trying to mount cache partition fails.
Change-Id: I0621accc580a5ae8ccf2494a76df457f152d51e3
Signed-off-by: Vishal Bohj <vishal.bhoj@linaro.org>
| -rw-r--r-- | BoardConfigCommon.mk | 1 | ||||
| -rw-r--r-- | hikey/BoardConfig.mk | 1 | ||||
| -rw-r--r-- | hikey/fstab.hikey | 1 | ||||
| -rw-r--r-- | hikey960/BoardConfig.mk | 1 | ||||
| -rw-r--r-- | hikey960/fstab.hikey960 | 1 | ||||
| -rwxr-xr-x | installer/hikey/flash-all.sh | 1 | ||||
| -rwxr-xr-x | installer/hikey960/flash-all.sh | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index cf4976e5..e559dad0 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -32,7 +32,6 @@ TARGET_HARDWARE_3D := true BOARD_USES_GENERIC_AUDIO := true USE_CAMERA_STUB := true TARGET_USERIMAGES_USE_EXT4 := true -BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_USE_PAN_DISPLAY := true TARGET_USES_HWC2 := true diff --git a/hikey/BoardConfig.mk b/hikey/BoardConfig.mk index 31a25ef6..2f5a983c 100644 --- a/hikey/BoardConfig.mk +++ b/hikey/BoardConfig.mk @@ -44,7 +44,6 @@ else BOARD_USERDATAIMAGE_PARTITION_SIZE := 5588893184 endif endif -BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 BOARD_FLASH_BLOCK_SIZE := 131072 # Vendor partition definitions diff --git a/hikey/fstab.hikey b/hikey/fstab.hikey index a1ccdac1..ef04e325 100644 --- a/hikey/fstab.hikey +++ b/hikey/fstab.hikey @@ -3,7 +3,6 @@ # The filesystem that contains the filesystem checker binary (typically /system) cannot # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK -/dev/block/platform/soc/f723d000.dwmmc0/by-name/cache /cache ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait /dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata /data f2fs discard,noatime,nosuid,nodev wait,check,fileencryption=software,quota /dev/block/platform/soc/f723d000.dwmmc0/by-name/userdata /data ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait,formattable /devices/platform/soc/f723e000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk index 730d5f55..a670f4f9 100644 --- a/hikey960/BoardConfig.mk +++ b/hikey960/BoardConfig.mk @@ -30,7 +30,6 @@ BOARD_MKBOOTIMG_ARGS := --base 0x0 --tags_offset 0x07a00000 --kernel_offset 0x00 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 4915724288 # 4688MB BOARD_USERDATAIMAGE_PARTITION_SIZE := 25845301248 # 24648MB -BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 # 256MB BOARD_FLASH_BLOCK_SIZE := 512 # Vendor partition definitions diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960 index 9f183905..fd957de4 100644 --- a/hikey960/fstab.hikey960 +++ b/hikey960/fstab.hikey960 @@ -5,7 +5,6 @@ #/dev/block/platform/soc/ff3b0000.ufs/by-name/system_a /system ext4 ro wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait -/dev/block/sdd5 /cache ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait /dev/block/sdd13 /data f2fs discard,noatime,nosuid,nodev wait,check,fileencryption=software,quota /dev/block/sdd13 /data ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait,formattable diff --git a/installer/hikey/flash-all.sh b/installer/hikey/flash-all.sh index be909fe6..4707d063 100755 --- a/installer/hikey/flash-all.sh +++ b/installer/hikey/flash-all.sh @@ -78,5 +78,4 @@ fastboot flash nvme "${INSTALLER_DIR}"/nvme.img fastboot flash boot "${OUT_IMGDIR}"/boot.img fastboot flash system "${OUT_IMGDIR}"/system.img fastboot flash vendor "${OUT_IMGDIR}"/vendor.img -fastboot flash cache "${OUT_IMGDIR}"/cache.img fastboot flash userdata "${OUT_IMGDIR}"/userdata.img diff --git a/installer/hikey960/flash-all.sh b/installer/hikey960/flash-all.sh index 70a95508..2888020b 100755 --- a/installer/hikey960/flash-all.sh +++ b/installer/hikey960/flash-all.sh @@ -26,6 +26,5 @@ fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img fastboot flash dts "${ANDROID_PRODUCT_OUT}"/dt.img fastboot flash system "${ANDROID_PRODUCT_OUT}"/system.img fastboot flash vendor "${ANDROID_PRODUCT_OUT}"/vendor.img -fastboot flash cache "${ANDROID_PRODUCT_OUT}"/cache.img fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img fastboot reboot |